Skip to content

Commit 9ca562b

Browse files
ARC-CPSkuba-moo
authored andcommitted
net: ipv6: flowlabel: defer exclusive option free until RCU teardown
`ip6fl_seq_show()` walks the global flowlabel hash under the seq-file RCU read-side lock and prints `fl->opt->opt_nflen` when an option block is present. Exclusive flowlabels currently free `fl->opt` as soon as `fl->users` drops to zero in `fl_release()`. However, the surrounding `struct ip6_flowlabel` remains visible in the global hash table until later garbage collection removes it and `fl_free_rcu()` finally tears it down. A concurrent `/proc/net/ip6_flowlabel` reader can therefore race that early `kfree()` and dereference freed option state, triggering a crash in `ip6fl_seq_show()`. Fix this by keeping `fl->opt` alive until `fl_free_rcu()`. That matches the lifetime already required for the enclosing flowlabel while readers can still reach it under RCU. Fixes: d3aedd5 ("ipv6 flowlabel: Convert hash list to RCU.") Reported-by: Yifan Wu <yifanwucs@gmail.com> Reported-by: Juefei Pu <tomapufckgml@gmail.com> Co-developed-by: Yuan Tan <yuantan098@gmail.com> Signed-off-by: Yuan Tan <yuantan098@gmail.com> Suggested-by: Xin Liu <bird@lzu.edu.cn> Tested-by: Ren Wei <enjou1224z@gmail.com> Signed-off-by: Zhengchuan Liang <zcliangcn@gmail.com> Signed-off-by: Ren Wei <n05ec@lzu.edu.cn> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/07351f0ec47bcee289576f39f9354f4a64add6e4.1774855883.git.zcliangcn@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent fa6e249 commit 9ca562b

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

net/ipv6/ip6_flowlabel.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@ static void fl_release(struct ip6_flowlabel *fl)
133133
if (time_after(ttd, fl->expires))
134134
fl->expires = ttd;
135135
ttd = fl->expires;
136-
if (fl->opt && fl->share == IPV6_FL_S_EXCL) {
137-
struct ipv6_txoptions *opt = fl->opt;
138-
fl->opt = NULL;
139-
kfree(opt);
140-
}
141136
if (!timer_pending(&ip6_fl_gc_timer) ||
142137
time_after(ip6_fl_gc_timer.expires, ttd))
143138
mod_timer(&ip6_fl_gc_timer, ttd);

0 commit comments

Comments
 (0)