John Haxby a737ff38d8 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:23:07 +02:00
..
2019-05-08 07:19:07 +02:00
2019-12-05 15:35:12 +01:00
2020-05-02 17:23:01 +02:00
2019-09-16 08:19:32 +02:00
2019-06-22 08:17:22 +02:00
2016-10-20 11:23:08 -04:00
2019-03-23 13:19:44 +01:00
2019-11-28 18:28:28 +01:00
2020-01-29 10:24:41 +01:00
2019-01-09 16:16:41 +01:00
2020-01-23 08:19:36 +01:00