diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-08-16 08:15:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-16 11:09:16 +0100 |
| commit | c274af2242693f59f00851b3660a21b10bcd76cc (patch) | |
| tree | 9e6dff9911b9a0fd9b26f973ea89217f5ca29da0 /net/l2tp | |
| parent | 936db833c2dd0a9ae738c8ce24fff816c9c8e381 (diff) | |
| download | linux-stable-c274af2242693f59f00851b3660a21b10bcd76cc.tar.gz linux-stable-c274af2242693f59f00851b3660a21b10bcd76cc.tar.bz2 linux-stable-c274af2242693f59f00851b3660a21b10bcd76cc.zip | |
inet: introduce inet->inet_flags
Various inet fields are currently racy.
do_ip_setsockopt() and do_ip_getsockopt() are mostly holding
the socket lock, but some (fast) paths do not.
Use a new inet->inet_flags to hold atomic bits in the series.
Remove inet->cmsg_flags, and use instead 9 bits from inet_flags.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index f9073bc7281f..9a2a9ed3ba47 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -552,7 +552,7 @@ static int l2tp_ip_recvmsg(struct sock *sk, struct msghdr *msg, memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); *addr_len = sizeof(*sin); } - if (inet->cmsg_flags) + if (inet_cmsg_flags(inet)) ip_cmsg_recv(msg, skb); if (flags & MSG_TRUNC) copied = skb->len; |