ipv4,ipv6: grab rtnl before locking the socket

Browse source

There are some setsockopt operations in ipv4 and ipv6 that are grabbing
rtnl after having grabbed the socket lock. Yet this makes it impossible
to do operations that have to lock the socket when already within a rtnl
protected scope, like ndo dev_open and dev_stop.

We normally take coarse grained locks first but setsockopt inverted that.

So this patch invert the lock logic for these operations and makes
setsockopt grab rtnl if it will be needed prior to grabbing socket lock.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Marcelo Ricardo Leitner 2015-03-18 14:50:42 -03:00 • committed by David S. Miller

parent fdf9ef8999

commit baf606d9c9

2 changed files with 52 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

31

net/ipv4/ip_sockglue.c

View file

35

net/ipv6/ipv6_sockglue.c

View file