Merge branch 'master' of git://blackhole.kfki.hu/nf

Browse source

Jozsef Kadlecsik says:

====================
Please apply the next patch against the nf tree:

- Deniz Eren reported that parallel flush/dump of list:set type of sets
  can lead to kernel crash. The bug was due to non-RCU compatible
  flushing, listing in the set type, fixed by me.

- Julia Lawall pointed out that IPSET_ATTR_ETHER netlink attribute
  length was not checked explicitly. The patch adds the missing
  checkings.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Pablo Neira Ayuso 2016-03-10 17:32:58 +01:00

parent 3b8377dca1 d8aacd8718

commit 793882bfc3

4 changed files with 32 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

2

net/netfilter/ipset/ip_set_bitmap_ipmac.c

View file

3

net/netfilter/ipset/ip_set_core.c

View file

3

net/netfilter/ipset/ip_set_hash_mac.c

View file

57

net/netfilter/ipset/ip_set_list_set.c

View file