John Haxby e7dff38799 ipv6: fix restrict IPV6_ADDRFORM operation
[ Upstream commit 82c9ae440857840c56e05d4fb1427ee032531346 ]

Commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation") fixed a
problem found by syzbot an unfortunate logic error meant that it
also broke IPV6_ADDRFORM.

Rearrange the checks so that the earlier test is just one of the series
of checks made before moving the socket from IPv6 to IPv4.

Fixes: b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation")
Signed-off-by: John Haxby <john.haxby@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-05-02 17:24:16 +02:00
..
2020-05-02 17:24:12 +02:00
2019-09-16 08:20:44 +02:00
2019-06-22 08:16:14 +02:00
2019-12-05 15:38:15 +01:00
2020-01-17 19:45:49 +01:00
2020-01-29 15:02:39 +01:00
2019-01-09 17:14:46 +01:00
2020-01-17 19:45:49 +01:00