1. 20 5月, 2007 7 次提交
    • P
      [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation · 5397e97d
      Patrick McHardy 提交于
      When the helper module is removed for a master connection that has a
      fulfilled expectation, but has already timed out and got removed from
      the hash tables, nf_conntrack_helper_unregister can't find the master
      connection to unset the helper, causing a use-after-free when the
      expected connection is destroyed and releases the last reference to
      the master.
      
      The helper destroy callback was introduced for the PPtP helper to clean
      up expectations and expected connections when the master connection
      times out, but doing this from destroy_conntrack only works for
      unfulfilled expectations since expected connections hold a reference
      to the master, preventing its destruction. Move the destroy callback to
      the timeout function, which fixes both problems.
      
      Reported/tested by Gabor Burjan <buga@buvoshetes.hu>.
      Signed-off-by: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5397e97d
    • H
      [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all · c92b3a2f
      Herbert Xu 提交于
      This is a natural extension of the changeset
      
          [XFRM]: Probe selected algorithm only.
      
      which only removed the probe call for xfrm_user.  This patch does exactly
      the same thing for af_key.  In other words, we load the algorithm requested
      by the user rather than everything when adding xfrm states in af_key.
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c92b3a2f
    • I
      [TCP] FRTO: Prevent state inconsistency in corner cases · 580e572a
      Ilpo Järvinen 提交于
      State could become inconsistent in two cases:
      
      1) Userspace disabled FRTO by tuning sysctl when one of the TCP
         flows was in the middle of FRTO algorithm (and then RTO is
         again triggered)
      
      2) SACK reneging occurs during FRTO algorithm
      
      A simple solution is just to abort the previous FRTO when such
      obscure condition occurs...
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      580e572a
    • I
      [TCP] FRTO: Add missing ECN CWR sending to one of the responses · 46323655
      Ilpo Järvinen 提交于
      The conservative spurious RTO response did not queue CWR even
      though the sending rate was lowered. Whenever reduction happens
      regardless of reason, CWR should be sent (forgetting to send it
      is not very fatal though).
      
      A better approach would be to queue CWR when one of the sending
      rate reducing responses (rate-halving one or this conservative
      response) is used already at RTO. Doing that would allow CWR to
      be sent along with the two new data segments that are sent
      during FRTO. However, it's a bit "racy" because userland could
      tune the response sysctl to a more aggressive one in between.
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      46323655
    • M
      [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error · b6ccc67d
      Mikael Pettersson 提交于
      Compiling 2.6.22-rc1 with gcc-3.2.3 for i486 fails with:
      
        gcc -m32 -Wp,-MD,net/core/.skbuff.o.d  -nostdinc -isystem /home/mikpe/pkgs/linux-x86/gnu/lib/gcc-lib/i486-pc-linux-gnu/3.2.3/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2 -pipe -msoft-float -mregparm=3 -freg-struct-return -mpreferred-stack-boundary=4  -march=i486 -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1  -Iinclude/asm-i386/mach-default -fomit-frame-pointer       -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(skbuff)"  -D"KBUILD_MODNAME=KBUILD_STR(skbuff)" -c -o net/core/skbuff.o net/core/skbuff.c
      net/core/skbuff.c:648:1: directives may not be used inside a macro argument
      net/core/skbuff.c:647:39: unterminated argument list invoking macro "memcpy"
      net/core/skbuff.c: In function `pskb_expand_head':
      net/core/skbuff.c:651: `memcpy' undeclared (first use in this function)
      net/core/skbuff.c:651: (Each undeclared identifier is reported only once
      net/core/skbuff.c:651: for each function it appears in.)
      net/core/skbuff.c:651: syntax error before "skb"
      make[2]: *** [net/core/skbuff.o] Error 1
      make[1]: *** [net/core] Error 2
      make: *** [net] Error 2
      
      The patch below implements a simple workaround which is to
      clone the offending memcpy() call and specialise it for the
      two different scenarios.
      
      Other workarounds are of course possible: e.g. bind the varying
      parameter in a local variable, or use a macro or inline function
      to perform the varying computation.
      Signed-off-by: NMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b6ccc67d
    • I
      [RFKILL]: Fix check for correct rfkill allocation · d007da1f
      Ivo van Doorn 提交于
      coverity has spotted a bug in rfkill.c (bug id #1627),
      in rfkill_allocate() NULL was returns if the kzalloc() works,
      and deref the NULL pointer if it fails,
      Signed-off-by: NIvo van Doorn <IvDoorn@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d007da1f
    • D
      [IPV6]: Add ip6_tunnel.h to headers_install · c34b19fb
      Deepak Saxena 提交于
      The Mobile IPv6 package (http://www.mobile-ipv6.org/software/) needs
      this header file to build the tunnelctl component. The header
      already looks sanitized so is safe to export.
      Signed-off-by: NDeepak Saxena <dsaxena@mvista.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c34b19fb
  2. 19 5月, 2007 7 次提交
  3. 18 5月, 2007 26 次提交