Skip to content

Commit

Permalink
ipv4: ipmr: fix NULL pointer deref during unres queue destruction
Browse files Browse the repository at this point in the history
Fix an oversight in ipmr_destroy_unres() - the net pointer is
unconditionally initialized to NULL, resulting in a NULL pointer
dereference later on.

Fix by adding a net pointer to struct mr_table and using it in
ipmr_destroy_unres().

Signed-off-by: Patrick McHardy <[email protected]>
  • Loading branch information
kaber committed Apr 15, 2010
1 parent b0ebb73 commit 8de53df
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion net/ipv4/ipmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@

struct mr_table {
struct list_head list;
#ifdef CONFIG_NET_NS
struct net *net;
#endif
u32 id;
struct sock *mroute_sk;
struct timer_list ipmr_expire_timer;
Expand Down Expand Up @@ -308,6 +311,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
mrt = kzalloc(sizeof(*mrt), GFP_KERNEL);
if (mrt == NULL)
return NULL;
write_pnet(&mrt->net, net);
mrt->id = id;

/* Forwarding cache */
Expand Down Expand Up @@ -580,7 +584,7 @@ static inline void ipmr_cache_free(struct mfc_cache *c)

static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c)
{
struct net *net = NULL; //mrt->net;
struct net *net = read_pnet(&mrt->net);
struct sk_buff *skb;
struct nlmsgerr *e;

Expand Down

0 comments on commit 8de53df

Please sign in to comment.