• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 5c4b2749
    David S. Miller authored
    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: default avatarDavid S. Miller <davem@davemloft.net>
    5c4b2749
MAINTAINERS 248 KB