nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: do not delay dst_entries_add() in dst_release()

Browse source 
dst_entries_add() uses per-cpu data that might be freed at netns
dismantle from ip6_route_net_exit() calling dst_entries_destroy()

Before ip6_route_net_exit() can be called, we release all
the dsts associated with this netns, via calls to dst_release(),
which waits an rcu grace period before calling dst_destroy()

dst_entries_add() use in dst_destroy() is racy, because
dst_entries_destroy() could have been called already.

Decrementing the number of dsts must happen sooner.

Notes:

1) in CONFIG_XFRM case, dst_destroy() can call
   dst_release_immediate(child), this might also cause UAF
   if the child does not have DST_NOCOUNT set.
   IPSEC maintainers might take a look and see how to address this.

2) There is also discussion about removing this count of dst,
   which might happen in future kernels.

Fixes: f886497212 ("ipv4: fix dst race in sk_dst_get()")
Closes: https://lore.kernel.org/lkml/CANn89iLCCGsP7SFn9HKpvnKu96Td4KD08xf7aGtiYgZnkjaL=w@mail.gmail.com/T/
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Link: https://patch.msgid.link/20241008143110.1064899-1-edumazet@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Eric Dumazet 2024-10-08 14:31:10 +00:00 committed by Paolo Abeni
parent a354733c73
commit ac888d5886
1 changed files with 12 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

17
net/core/dst.c
View file

@ -109,9 +109,6 @@ static void dst_destroy(struct dst_entry *dst)
child = xdst->child; child = xdst->child;
} }
#endif #endif
if (!(dst->flags & DST_NOCOUNT))
dst_entries_add(dst->ops, -1);
if (dst->ops->destroy) if (dst->ops->destroy)
dst->ops->destroy(dst); dst->ops->destroy(dst);
netdev_put(dst->dev, &dst->dev_tracker); netdev_put(dst->dev, &dst->dev_tracker);
@ -159,17 +156,27 @@ void dst_dev_put(struct dst_entry *dst)
} }
EXPORT_SYMBOL(dst_dev_put); EXPORT_SYMBOL(dst_dev_put);
static void dst_count_dec(struct dst_entry *dst)
{
if (!(dst->flags & DST_NOCOUNT))
dst_entries_add(dst->ops, -1);
}
void dst_release(struct dst_entry *dst) void dst_release(struct dst_entry *dst)
{ {
if (dst && rcuref_put(&dst->__rcuref)) if (dst && rcuref_put(&dst->__rcuref)) {
dst_count_dec(dst);
call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu); call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
}
} }
EXPORT_SYMBOL(dst_release); EXPORT_SYMBOL(dst_release);
void dst_release_immediate(struct dst_entry *dst) void dst_release_immediate(struct dst_entry *dst)
{ {
if (dst && rcuref_put(&dst->__rcuref)) if (dst && rcuref_put(&dst->__rcuref)) {
dst_count_dec(dst);
dst_destroy(dst); dst_destroy(dst);
}
} }
EXPORT_SYMBOL(dst_release_immediate); EXPORT_SYMBOL(dst_release_immediate);