Skip to content

Commit 9fcf986

Browse files
edumazetkuba-moo
authored andcommitted
ipv4: fix data races in fib_alias_hw_flags_set
fib_alias_hw_flags_set() can be used by concurrent threads, and is only RCU protected. We need to annotate accesses to following fields of struct fib_alias: offload, trap, offload_failed Because of READ_ONCE()WRITE_ONCE() limitations, make these field u8. BUG: KCSAN: data-race in fib_alias_hw_flags_set / fib_alias_hw_flags_set read to 0xffff888134224a6a of 1 bytes by task 2013 on cpu 1: fib_alias_hw_flags_set+0x28a/0x470 net/ipv4/fib_trie.c:1050 nsim_fib4_rt_hw_flags_set drivers/net/netdevsim/fib.c:350 [inline] nsim_fib4_rt_add drivers/net/netdevsim/fib.c:367 [inline] nsim_fib4_rt_insert drivers/net/netdevsim/fib.c:429 [inline] nsim_fib4_event drivers/net/netdevsim/fib.c:461 [inline] nsim_fib_event drivers/net/netdevsim/fib.c:881 [inline] nsim_fib_event_work+0x1852/0x2cf0 drivers/net/netdevsim/fib.c:1477 process_one_work+0x3f6/0x960 kernel/workqueue.c:2307 process_scheduled_works kernel/workqueue.c:2370 [inline] worker_thread+0x7df/0xa70 kernel/workqueue.c:2456 kthread+0x1bf/0x1e0 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 write to 0xffff888134224a6a of 1 bytes by task 4872 on cpu 0: fib_alias_hw_flags_set+0x2d5/0x470 net/ipv4/fib_trie.c:1054 nsim_fib4_rt_hw_flags_set drivers/net/netdevsim/fib.c:350 [inline] nsim_fib4_rt_add drivers/net/netdevsim/fib.c:367 [inline] nsim_fib4_rt_insert drivers/net/netdevsim/fib.c:429 [inline] nsim_fib4_event drivers/net/netdevsim/fib.c:461 [inline] nsim_fib_event drivers/net/netdevsim/fib.c:881 [inline] nsim_fib_event_work+0x1852/0x2cf0 drivers/net/netdevsim/fib.c:1477 process_one_work+0x3f6/0x960 kernel/workqueue.c:2307 process_scheduled_works kernel/workqueue.c:2370 [inline] worker_thread+0x7df/0xa70 kernel/workqueue.c:2456 kthread+0x1bf/0x1e0 kernel/kthread.c:377 ret_from_fork+0x1f/0x30 value changed: 0x00 -> 0x02 Reported by Kernel Concurrency Sanitizer on: CPU: 0 PID: 4872 Comm: kworker/0:0 Not tainted 5.17.0-rc3-syzkaller-00188-g1d41d2e82623-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events nsim_fib_event_work Fixes: 90b93f1 ("ipv4: Add "offload" and "trap" indications to routes") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot <syzkaller@googlegroups.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Link: https://lore.kernel.org/r/20220216173217.3792411-1-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 430065e commit 9fcf986

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

net/ipv4/fib_lookup.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ struct fib_alias {
1616
u8 fa_slen;
1717
u32 tb_id;
1818
s16 fa_default;
19-
u8 offload:1,
20-
trap:1,
21-
offload_failed:1,
22-
unused:5;
19+
u8 offload;
20+
u8 trap;
21+
u8 offload_failed;
2322
struct rcu_head rcu;
2423
};
2524

net/ipv4/fib_semantics.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,9 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
525525
fri.dst_len = dst_len;
526526
fri.tos = fa->fa_tos;
527527
fri.type = fa->fa_type;
528-
fri.offload = fa->offload;
529-
fri.trap = fa->trap;
530-
fri.offload_failed = fa->offload_failed;
528+
fri.offload = READ_ONCE(fa->offload);
529+
fri.trap = READ_ONCE(fa->trap);
530+
fri.offload_failed = READ_ONCE(fa->offload_failed);
531531
err = fib_dump_info(skb, info->portid, seq, event, &fri, nlm_flags);
532532
if (err < 0) {
533533
/* -EMSGSIZE implies BUG in fib_nlmsg_size() */

net/ipv4/fib_trie.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,19 +1047,23 @@ void fib_alias_hw_flags_set(struct net *net, const struct fib_rt_info *fri)
10471047
if (!fa_match)
10481048
goto out;
10491049

1050-
if (fa_match->offload == fri->offload && fa_match->trap == fri->trap &&
1051-
fa_match->offload_failed == fri->offload_failed)
1050+
/* These are paired with the WRITE_ONCE() happening in this function.
1051+
* The reason is that we are only protected by RCU at this point.
1052+
*/
1053+
if (READ_ONCE(fa_match->offload) == fri->offload &&
1054+
READ_ONCE(fa_match->trap) == fri->trap &&
1055+
READ_ONCE(fa_match->offload_failed) == fri->offload_failed)
10521056
goto out;
10531057

1054-
fa_match->offload = fri->offload;
1055-
fa_match->trap = fri->trap;
1058+
WRITE_ONCE(fa_match->offload, fri->offload);
1059+
WRITE_ONCE(fa_match->trap, fri->trap);
10561060

10571061
/* 2 means send notifications only if offload_failed was changed. */
10581062
if (net->ipv4.sysctl_fib_notify_on_flag_change == 2 &&
1059-
fa_match->offload_failed == fri->offload_failed)
1063+
READ_ONCE(fa_match->offload_failed) == fri->offload_failed)
10601064
goto out;
10611065

1062-
fa_match->offload_failed = fri->offload_failed;
1066+
WRITE_ONCE(fa_match->offload_failed, fri->offload_failed);
10631067

10641068
if (!net->ipv4.sysctl_fib_notify_on_flag_change)
10651069
goto out;
@@ -2297,9 +2301,9 @@ static int fn_trie_dump_leaf(struct key_vector *l, struct fib_table *tb,
22972301
fri.dst_len = KEYLENGTH - fa->fa_slen;
22982302
fri.tos = fa->fa_tos;
22992303
fri.type = fa->fa_type;
2300-
fri.offload = fa->offload;
2301-
fri.trap = fa->trap;
2302-
fri.offload_failed = fa->offload_failed;
2304+
fri.offload = READ_ONCE(fa->offload);
2305+
fri.trap = READ_ONCE(fa->trap);
2306+
fri.offload_failed = READ_ONCE(fa->offload_failed);
23032307
err = fib_dump_info(skb,
23042308
NETLINK_CB(cb->skb).portid,
23052309
cb->nlh->nlmsg_seq,

net/ipv4/route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3395,8 +3395,8 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
33953395
fa->fa_tos == fri.tos &&
33963396
fa->fa_info == res.fi &&
33973397
fa->fa_type == fri.type) {
3398-
fri.offload = fa->offload;
3399-
fri.trap = fa->trap;
3398+
fri.offload = READ_ONCE(fa->offload);
3399+
fri.trap = READ_ONCE(fa->trap);
34003400
break;
34013401
}
34023402
}

0 commit comments

Comments
 (0)