diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-16 23:32:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-16 23:32:42 +0200 |
| commit | 5c4b274981950049af3330f14ed9e9aa25afb2fb (patch) | |
| tree | a4a154f7e49220a46124b29801f07830f28ca81d /arch/arc/plat-tb10x/tb10x.c | |
| parent | broadcom: add include guards to include/linux/brcmphy.h (diff) | |
| parent | netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundary (diff) | |
| download | linux-5c4b274981950049af3330f14ed9e9aa25afb2fb.tar.xz linux-5c4b274981950049af3330f14ed9e9aa25afb2fb.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 and update
for the MAINTAINER file for your net tree, they are:
* Fix crash if nf_log_packet is called from conntrack, in that case
both interfaces are NULL, from Hans Schillstrom. This bug introduced
with the logging netns support in the previous merge window.
* Fix compilation of nf_log and nf_queue without CONFIG_PROC_FS,
from myself. This bug was introduced in the previous merge window
with the new netns support for the netfilter logging infrastructure.
* Fix possible crash in xt_TCPOPTSTRIP due to missing sanity
checkings to validate that the TCP header is well-formed, from
myself. I can find this bug in 2.6.25, probably it's been there
since the beginning. I'll pass this to -stable.
* Update MAINTAINER file to point to new nf trees at git.kernel.org,
remove Harald and use M: instead of P: (now obsolete tag) to
keep Jozsef in the list of people.
Please, consider pulling this. Thanks!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arc/plat-tb10x/tb10x.c')
0 files changed, 0 insertions, 0 deletions