Skip to content

Commit 2f73305

Browse files
skorpion17opsiff
authored andcommitted
net: ipv6: fix NOREF dst use in seg6 and rpl lwtunnels
commit f9c52a6ba9780bd27e0bf4c044fd91c13c778b6e upstream. seg6_input_core() and rpl_input() call ip6_route_input() which sets a NOREF dst on the skb, then pass it to dst_cache_set_ip6() invoking dst_hold() unconditionally. On PREEMPT_RT, ksoftirqd is preemptible and a higher-priority task can release the underlying pcpu_rt between the lookup and the caching through a concurrent FIB lookup on a shared nexthop. Simplified race sequence: ksoftirqd/X higher-prio task (same CPU X) ----------- -------------------------------- seg6_input_core(,skb)/rpl_input(skb) dst_cache_get() -> miss ip6_route_input(skb) -> ip6_pol_route(,skb,flags) [RT6_LOOKUP_F_DST_NOREF in flags] -> FIB lookup resolves fib6_nh [nhid=N route] -> rt6_make_pcpu_route() [creates pcpu_rt, refcount=1] pcpu_rt->sernum = fib6_sernum [fib6_sernum=W] -> cmpxchg(fib6_nh.rt6i_pcpu, NULL, pcpu_rt) [slot was empty, store succeeds] -> skb_dst_set_noref(skb, dst) [dst is pcpu_rt, refcount still 1] rt_genid_bump_ipv6() -> bumps fib6_sernum [fib6_sernum from W to Z] ip6_route_output() -> ip6_pol_route() -> FIB lookup resolves fib6_nh [nhid=N] -> rt6_get_pcpu_route() pcpu_rt->sernum != fib6_sernum [W <> Z, stale] -> prev = xchg(rt6i_pcpu, NULL) -> dst_release(prev) [prev is pcpu_rt, refcount 1->0, dead] dst = skb_dst(skb) [dst is the dead pcpu_rt] dst_cache_set_ip6(dst) -> dst_hold() on dead dst -> WARN / use-after-free For the race to occur, ksoftirqd must be preemptible (PREEMPT_RT without PREEMPT_RT_NEEDS_BH_LOCK) and a concurrent task must be able to release the pcpu_rt. Shared nexthop objects provide such a path, as two routes pointing to the same nhid share the same fib6_nh and its rt6i_pcpu entry. Fix seg6_input_core() and rpl_input() by calling skb_dst_force() after ip6_route_input() to force the NOREF dst into a refcounted one before caching. The output path is not affected as ip6_route_output() already returns a refcounted dst. Fixes: af4a220 ("ipv6: sr: use dst_cache in seg6_input") Fixes: a7a29f9 ("net: ipv6: add rpl sr tunnel") Cc: stable@vger.kernel.org Signed-off-by: Andrea Mayer <andrea.mayer@uniroma2.it> Reviewed-by: Simon Horman <horms@kernel.org> Reviewed-by: Justin Iurman <justin.iurman@gmail.com> Link: https://patch.msgid.link/20260421094735.20997-1-andrea.mayer@uniroma2.it Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit b778b6d095421619c331fd2d7751143cd5387103) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 67ef32e commit 2f73305

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

net/ipv6/rpl_iptunnel.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,16 @@ static int rpl_input(struct sk_buff *skb)
287287

288288
if (!dst) {
289289
ip6_route_input(skb);
290+
291+
/* ip6_route_input() sets a NOREF dst; force a refcount on it
292+
* before caching or further use.
293+
*/
294+
skb_dst_force(skb);
290295
dst = skb_dst(skb);
296+
if (unlikely(!dst)) {
297+
err = -ENETUNREACH;
298+
goto drop;
299+
}
291300

292301
/* cache only if we don't create a dst reference loop */
293302
if (!dst->error && lwtst != dst->lwtstate) {

net/ipv6/seg6_iptunnel.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,16 @@ static int seg6_input_core(struct net *net, struct sock *sk,
500500

501501
if (!dst) {
502502
ip6_route_input(skb);
503+
504+
/* ip6_route_input() sets a NOREF dst; force a refcount on it
505+
* before caching or further use.
506+
*/
507+
skb_dst_force(skb);
503508
dst = skb_dst(skb);
509+
if (unlikely(!dst)) {
510+
err = -ENETUNREACH;
511+
goto drop;
512+
}
504513

505514
/* cache only if we don't create a dst reference loop */
506515
if (!dst->error && lwtst != dst->lwtstate) {

0 commit comments

Comments
 (0)