diff options
author | 2013-10-23 16:55:04 -0400 | |
---|---|---|
committer | 2013-10-23 16:55:04 -0400 | |
commit | afb14c7cb66c0401237b181131fd3d6bd4810909 (patch) | |
tree | e87dec56dd5b20926aa4a35449e1c463d1d2db00 /net/core/netpoll.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
parent | netfilter: x_tables: fix ordering of jumpstack allocation and table update (diff) | |
download | wireguard-linux-afb14c7cb66c0401237b181131fd3d6bd4810909.tar.xz wireguard-linux-afb14c7cb66c0401237b181131fd3d6bd4810909.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains three netfilter fixes for your net
tree, they are:
* A couple of fixes to resolve info leak to userspace due to uninitialized
memory area in ulogd, from Mathias Krause.
* Fix instruction ordering issues that may lead to the access of
uninitialized data in x_tables. The problem involves the table update
(producer) and the main packet matching (consumer) routines. Detected in
SMP ARMv7, from Will Deacon.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
0 files changed, 0 insertions, 0 deletions