diff options
| author |   Hangbin Liu <liuhangbin@gmail.com> | 2020-06-01 11:55:03 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-01 15:47:04 -0700 |
| commit | 79a1f0ccdbb4ad700590f61b00525b390cb53905 (patch) | |
| tree | e7d884a2296980bf2d4103707d86be33ebcddf8c /drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | |
| parent | tipc: Fix NULL pointer dereference in __tipc_sendstream() (diff) | |
| download | linux-dev-79a1f0ccdbb4ad700590f61b00525b390cb53905.tar.xz linux-dev-79a1f0ccdbb4ad700590f61b00525b390cb53905.zip | |
ipv6: fix IPV6_ADDRFORM operation logic
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions