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

Browse source

Jozsef Kadlecsik says:
====================
Please apply the next bugfixes against the nf tree.

- Fix extensions alignment in ipset: Gerhard Wiesinger reported
  that the missing data aligments lead to crash on non-intel
  architecture. The patch was tested on armv7h by Gerhard Wiesinger
  and on x86_64 and sparc64 by me.
- An incorrect index at the hash:* types could lead to
  falsely early expired entries and memory leak when the comment
  extension was used too.
- Release empty hash bucket block when all entries are expired or
  all slots are empty instead of shrinkig the data part to zero.
====================

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

...

This commit is contained in:

Pablo Neira Ayuso 2015-11-08 23:52:23 +01:00

parent b4865988ea 0aae24eb40

commit e75cb467df

8 changed files with 75 additions and 85 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

include/linux/netfilter/ipset/ip_set.h

View file

17

net/netfilter/ipset/ip_set_bitmap_gen.h

View file

14

net/netfilter/ipset/ip_set_bitmap_ip.c

View file

64

net/netfilter/ipset/ip_set_bitmap_ipmac.c

View file

18

net/netfilter/ipset/ip_set_bitmap_port.c

View file

14

net/netfilter/ipset/ip_set_core.c

View file

26

net/netfilter/ipset/ip_set_hash_gen.h

View file

5

net/netfilter/ipset/ip_set_list_set.c

View file