* [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic
@ 2020-06-01 3:55 Hangbin Liu
2020-06-01 4:02 ` Hangbin Liu
2020-06-01 22:48 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Hangbin Liu @ 2020-06-01 3:55 UTC (permalink / raw)
To: netdev
Cc: John Haxby, David S . Miller, Eric Dumazet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, Jakub Kicinski, stable, Hangbin Liu
Socket option IPV6_ADDRFORM supports UDP/UDPLITE and TCP at present.
Previously the checking logic looks like:
if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
do_some_check;
else if (sk->sk_protocol != IPPROTO_TCP)
break;
After commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation"), TCP
was blocked as the logic changed to:
if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
do_some_check;
else if (sk->sk_protocol == IPPROTO_TCP)
do_some_check;
break;
else
break;
Then after commit 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
UDP/UDPLITE were blocked as the logic changed to:
if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
do_some_check;
if (sk->sk_protocol == IPPROTO_TCP)
do_some_check;
if (sk->sk_protocol != IPPROTO_TCP)
break;
Fix it by using Eric's code and simply remove the break in TCP check, which
looks like:
if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
do_some_check;
else if (sk->sk_protocol == IPPROTO_TCP)
do_some_check;
else
break;
Fixes: 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
net/ipv6/ipv6_sockglue.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 18d05403d3b5..5af97b4f5df3 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -183,14 +183,15 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
retv = -EBUSY;
break;
}
- }
- if (sk->sk_protocol == IPPROTO_TCP &&
- sk->sk_prot != &tcpv6_prot) {
- retv = -EBUSY;
+ } else if (sk->sk_protocol == IPPROTO_TCP) {
+ if (sk->sk_prot != &tcpv6_prot) {
+ retv = -EBUSY;
+ break;
+ }
+ } else {
break;
}
- if (sk->sk_protocol != IPPROTO_TCP)
- break;
+
if (sk->sk_state != TCP_ESTABLISHED) {
retv = -ENOTCONN;
break;
--
2.25.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic
2020-06-01 3:55 [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic Hangbin Liu
@ 2020-06-01 4:02 ` Hangbin Liu
2020-06-01 22:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Hangbin Liu @ 2020-06-01 4:02 UTC (permalink / raw)
To: network dev
Cc: John Haxby, David S . Miller, Eric Dumazet, Alexey Kuznetsov,
Hideaki YOSHIFUJI, Jakub Kicinski, stable, Frantisek Hrbata
cc Frantisek
On Mon, 1 Jun 2020 at 12:00, Hangbin Liu <liuhangbin@gmail.com> wrote:
>
> Socket option IPV6_ADDRFORM supports UDP/UDPLITE and TCP at present.
> Previously the checking logic looks like:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol != IPPROTO_TCP)
> break;
>
> After commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation"), TCP
> was blocked as the logic changed to:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
> break;
> else
> break;
>
> Then after commit 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
> UDP/UDPLITE were blocked as the logic changed to:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
>
> if (sk->sk_protocol != IPPROTO_TCP)
> break;
>
> Fix it by using Eric's code and simply remove the break in TCP check, which
> looks like:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
> else
> break;
>
> Fixes: 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---
> net/ipv6/ipv6_sockglue.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
> index 18d05403d3b5..5af97b4f5df3 100644
> --- a/net/ipv6/ipv6_sockglue.c
> +++ b/net/ipv6/ipv6_sockglue.c
> @@ -183,14 +183,15 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
> retv = -EBUSY;
> break;
> }
> - }
> - if (sk->sk_protocol == IPPROTO_TCP &&
> - sk->sk_prot != &tcpv6_prot) {
> - retv = -EBUSY;
> + } else if (sk->sk_protocol == IPPROTO_TCP) {
> + if (sk->sk_prot != &tcpv6_prot) {
> + retv = -EBUSY;
> + break;
> + }
> + } else {
> break;
> }
> - if (sk->sk_protocol != IPPROTO_TCP)
> - break;
> +
> if (sk->sk_state != TCP_ESTABLISHED) {
> retv = -ENOTCONN;
> break;
> --
> 2.25.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic
2020-06-01 3:55 [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic Hangbin Liu
2020-06-01 4:02 ` Hangbin Liu
@ 2020-06-01 22:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-06-01 22:48 UTC (permalink / raw)
To: liuhangbin; +Cc: netdev, john.haxby, edumazet, kuznet, yoshfuji, kuba, stable
From: Hangbin Liu <liuhangbin@gmail.com>
Date: Mon, 1 Jun 2020 11:55:03 +0800
> Socket option IPV6_ADDRFORM supports UDP/UDPLITE and TCP at present.
> Previously the checking logic looks like:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol != IPPROTO_TCP)
> break;
>
> After commit b6f6118901d1 ("ipv6: restrict IPV6_ADDRFORM operation"), TCP
> was blocked as the logic changed to:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
> break;
> else
> break;
>
> Then after commit 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
> UDP/UDPLITE were blocked as the logic changed to:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
>
> if (sk->sk_protocol != IPPROTO_TCP)
> break;
>
> Fix it by using Eric's code and simply remove the break in TCP check, which
> looks like:
> if (sk->sk_protocol == IPPROTO_UDP || sk->sk_protocol == IPPROTO_UDPLITE)
> do_some_check;
> else if (sk->sk_protocol == IPPROTO_TCP)
> do_some_check;
> else
> break;
>
> Fixes: 82c9ae440857 ("ipv6: fix restrict IPV6_ADDRFORM operation")
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-01 22:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-01 3:55 [PATCH net] ipv6: fix IPV6_ADDRFORM operation logic Hangbin Liu
2020-06-01 4:02 ` Hangbin Liu
2020-06-01 22:48 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).