]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Apr 2015 03:12:34 +0000 (23:12 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Apr 2015 03:12:34 +0000 (23:12 -0400)
commit81aca7bd77859c0432db1c6ca7b975a343cd37f0
tree8f1299a1ac38bd64415482212a33510eb94b3f56
parent60ab94414fd8217906f2552c1ee22bb77a8b96ff
parente7d799704ebddcfc10cebe594b00429704d7fbb2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for your net tree,
they are:

1) Fix a crash in nf_tables when dictionaries are used from the ruleset,
   due to memory corruption, from Florian Westphal.

2) Fix another crash in nf_queue when used with br_netfilter. Also from
   Florian.

Both fixes are related to new stuff that got in 4.0-rc.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>