tun: use socket locks for sk_{attach,detatch}_filter

Browse source

This reverts commit 5a5abb1fa3 ("tun, bpf: fix suspicious RCU usage
in tun_{attach, detach}_filter") and replaces it to use lock_sock around
sk_{attach,detach}_filter. The checks inside filter.c are updated with
lockdep_sock_is_held to check for proper socket locks.

It keeps the code cleaner by ensuring that only one lock governs the
socket filter instead of two independent locks.

Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Hannes Frederic Sowa 2016-04-05 17:10:16 +02:00 • committed by David S. Miller

parent 1e1d04e678

commit 8ced425ee6

3 changed files with 22 additions and 31 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

14

drivers/net/tun.c

View file

4

include/linux/filter.h

View file

35

net/core/filter.c

View file