Skip to content

Commit

Permalink
netpoll: fix NULL pointer dereference in netpoll_cleanup
Browse files Browse the repository at this point in the history
I've been hitting a NULL ptr deref while using netconsole because the
np->dev check and the pointer manipulation in netpoll_cleanup are done
without rtnl and the following sequence happens when having a netconsole
over a vlan and we remove the vlan while disabling the netconsole:
	CPU 1					CPU2
					removes vlan and calls the notifier
enters store_enabled(), calls
netdev_cleanup which checks np->dev
and then waits for rtnl
					executes the netconsole netdev
					release notifier making np->dev
					== NULL and releases rtnl
continues to dereference a member of
np->dev which at this point is == NULL

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nikolay Aleksandrov authored and David S. Miller committed Sep 19, 2013
1 parent c194992 commit d0fe8c8
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/core/netpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -1284,15 +1284,14 @@ EXPORT_SYMBOL_GPL(__netpoll_free_async);

void netpoll_cleanup(struct netpoll *np)
{
if (!np->dev)
return;

rtnl_lock();
if (!np->dev)
goto out;
__netpoll_cleanup(np);
rtnl_unlock();

dev_put(np->dev);
np->dev = NULL;
out:
rtnl_unlock();
}
EXPORT_SYMBOL(netpoll_cleanup);

Expand Down

0 comments on commit d0fe8c8

Please sign in to comment.