Skip to content

Commit

Permalink
ipmr: add debug check for mr table cleanup
Browse files Browse the repository at this point in the history
The multicast route tables lifecycle, for both ipv4 and ipv6, is
protected by RCU using the RTNL lock for write access. In many
places a table pointer escapes the RCU (or RTNL) protected critical
section, but such scenarios are actually safe because tables are
deleted only at namespace cleanup time or just after allocation, in
case of default rule creation failure.

Tables freed at namespace cleanup time are assured to be alive for the
whole netns lifetime; tables freed just after creation time are never
exposed to other possible users.

Ensure that the free conditions are respected in ip{,6}mr_free_table, to
document the locking schema and to prevent future possible introduction
of 'table del' operation from breaking it.

Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Paolo Abeni committed Nov 28, 2024
1 parent 663a917 commit 11b6e70
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
14 changes: 14 additions & 0 deletions net/ipv4/ipmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ static void ipmr_expire_process(struct timer_list *t);
lockdep_rtnl_is_held() || \
list_empty(&net->ipv4.mr_tables))

static bool ipmr_can_free_table(struct net *net)
{
return !check_net(net) || !net->ipv4.mr_rules_ops;
}

static struct mr_table *ipmr_mr_table_iter(struct net *net,
struct mr_table *mrt)
{
Expand Down Expand Up @@ -302,6 +307,11 @@ EXPORT_SYMBOL(ipmr_rule_default);
#define ipmr_for_each_table(mrt, net) \
for (mrt = net->ipv4.mrt; mrt; mrt = NULL)

static bool ipmr_can_free_table(struct net *net)
{
return !check_net(net);
}

static struct mr_table *ipmr_mr_table_iter(struct net *net,
struct mr_table *mrt)
{
Expand Down Expand Up @@ -413,6 +423,10 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)

static void ipmr_free_table(struct mr_table *mrt)
{
struct net *net = read_pnet(&mrt->net);

DEBUG_NET_WARN_ON_ONCE(!ipmr_can_free_table(net));

timer_shutdown_sync(&mrt->ipmr_expire_timer);
mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC |
MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC);
Expand Down
14 changes: 14 additions & 0 deletions net/ipv6/ip6mr.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ static void ipmr_expire_process(struct timer_list *t);
lockdep_rtnl_is_held() || \
list_empty(&net->ipv6.mr6_tables))

static bool ip6mr_can_free_table(struct net *net)
{
return !check_net(net) || !net->ipv6.mr6_rules_ops;
}

static struct mr_table *ip6mr_mr_table_iter(struct net *net,
struct mr_table *mrt)
{
Expand Down Expand Up @@ -291,6 +296,11 @@ EXPORT_SYMBOL(ip6mr_rule_default);
#define ip6mr_for_each_table(mrt, net) \
for (mrt = net->ipv6.mrt6; mrt; mrt = NULL)

static bool ip6mr_can_free_table(struct net *net)
{
return !check_net(net);
}

static struct mr_table *ip6mr_mr_table_iter(struct net *net,
struct mr_table *mrt)
{
Expand Down Expand Up @@ -392,6 +402,10 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id)

static void ip6mr_free_table(struct mr_table *mrt)
{
struct net *net = read_pnet(&mrt->net);

DEBUG_NET_WARN_ON_ONCE(!ip6mr_can_free_table(net));

timer_shutdown_sync(&mrt->ipmr_expire_timer);
mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC |
MRT6_FLUSH_MFC | MRT6_FLUSH_MFC_STATIC);
Expand Down

0 comments on commit 11b6e70

Please sign in to comment.