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>
Showing
- MAINTAINERS 5 additions, 5 deletionsMAINTAINERS
- include/net/netfilter/nf_log.h 2 additions, 1 deletioninclude/net/netfilter/nf_log.h
- include/net/netfilter/nfnetlink_log.h 2 additions, 1 deletioninclude/net/netfilter/nfnetlink_log.h
- net/bridge/netfilter/ebt_log.c 5 additions, 6 deletionsnet/bridge/netfilter/ebt_log.c
- net/bridge/netfilter/ebt_ulog.c 11 additions, 7 deletionsnet/bridge/netfilter/ebt_ulog.c
- net/ipv4/netfilter/ipt_ULOG.c 8 additions, 5 deletionsnet/ipv4/netfilter/ipt_ULOG.c
- net/netfilter/nf_log.c 5 additions, 2 deletionsnet/netfilter/nf_log.c
- net/netfilter/nfnetlink_log.c 4 additions, 2 deletionsnet/netfilter/nfnetlink_log.c
- net/netfilter/nfnetlink_queue_core.c 2 additions, 0 deletionsnet/netfilter/nfnetlink_queue_core.c
- net/netfilter/xt_LOG.c 7 additions, 6 deletionsnet/netfilter/xt_LOG.c
- net/netfilter/xt_NFLOG.c 2 additions, 1 deletionnet/netfilter/xt_NFLOG.c
- net/netfilter/xt_TCPOPTSTRIP.c 14 additions, 3 deletionsnet/netfilter/xt_TCPOPTSTRIP.c
Loading
Please register or sign in to comment