ipv6: fix restrict IPV6_ADDRFORM operation
Subsystems (4)
cover ipv6: fix restrict IPV6_ADDRFORM operation
Commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation") added a check to ensure that sk->sk_prot is the default pointer for a TCP IPv6 socket, an issue found by syzbot.
The earlier code simply had
if (sk->sk_protocol != IPPROTO_TCP)
break;and the new code degenerated to
if (sk->sk_protocol == IPPROTO_TCP)
break;the very opposite of what was intended. The following patch rearranges the checks so that the original sk->sk_prot == &tcpv6_prot is just one of the series of checks made before moving the socket.
jch
John Haxby (1):
ipv6: fix restrict IPV6_ADDRFORM operation
net/ipv6/ipv6_sockglue.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Signature · 1 line
2.25.3
PATCH 1/1 ipv6: fix restrict IPV6_ADDRFORM operation
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.
--- net/ipv6/ipv6_sockglue.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
net/ipv6/ipv6_sockglue.c +6 -7
@@ -183,15 +183,14 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, retv = -EBUSY ;break ; } - }else if (sk->sk_protocol ==IPPROTO_TCP ) { -if (sk->sk_prot != &tcpv6_prot) { - retv = -EBUSY ; -break ; - } -break ; - }else { + } +if (sk->sk_protocol ==IPPROTO_TCP && + sk->sk_prot != &tcpv6_prot) { + retv = -EBUSY ;break ; } +if (sk->sk_protocol !=IPPROTO_TCP ) +break ;if (sk->sk_state !=TCP_ESTABLISHED ) { retv = -ENOTCONN ;break ;
Signature · 1 line
2.25.3
From: John Haxby <[email protected]>
Date: Sat, 18 Apr 2020 16:30:49 +0100
Quoted 9 lines
Commit
b6f6118901d1("ipv6: restrictIPV6_ADDRFORMoperation") fixed a problem found by syzbot an unfortunate logic error meant that it also brokeIPV6_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 <[email protected]>
Applied, thanks.