John Haxby 59ff94db97 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:20:32 +02:00
..
2019-12-05 15:27:07 +01:00
2020-04-02 19:02:34 +02:00
2020-05-02 17:20:30 +02:00
2019-09-16 08:13:35 +02:00
2015-10-07 04:27:43 -07:00
2019-06-22 08:18:25 +02:00
2019-03-23 08:44:34 +01:00
2019-11-28 18:25:43 +01:00
2020-01-29 10:21:53 +01:00
2019-01-13 10:05:28 +01:00
2018-02-25 11:03:37 +01:00
2020-01-23 08:18:37 +01:00