Skip to content

Commit 3a5f555

Browse files
Yue Haibingkuba-moo
authored andcommitted
ipv6: annotate data-races around devconf->rpl_seg_enabled
devconf->rpl_seg_enabled can be changed concurrently from /proc/sys/net/ipv6/conf, annotate lockless reads on it. Signed-off-by: Yue Haibing <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 41ec374 commit 3a5f555

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

net/ipv6/exthdrs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,8 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
494494

495495
idev = __in6_dev_get(skb->dev);
496496

497-
accept_rpl_seg = net->ipv6.devconf_all->rpl_seg_enabled;
498-
if (accept_rpl_seg > idev->cnf.rpl_seg_enabled)
499-
accept_rpl_seg = idev->cnf.rpl_seg_enabled;
500-
497+
accept_rpl_seg = min(READ_ONCE(net->ipv6.devconf_all->rpl_seg_enabled),
498+
READ_ONCE(idev->cnf.rpl_seg_enabled));
501499
if (!accept_rpl_seg) {
502500
kfree_skb(skb);
503501
return -1;

0 commit comments

Comments
 (0)