1. 17 6月, 2008 18 次提交
  2. 15 6月, 2008 14 次提交
  3. 14 6月, 2008 2 次提交
  4. 13 6月, 2008 2 次提交
    • D
      tcp: Revert 'process defer accept as established' changes. · ec0a1966
      David S. Miller 提交于
      This reverts two changesets, ec3c0982
      ("[TCP]: TCP_DEFER_ACCEPT updates - process as established") and
      the follow-on bug fix 9ae27e0a
      ("tcp: Fix slab corruption with ipv6 and tcp6fuzz").
      
      This change causes several problems, first reported by Ingo Molnar
      as a distcc-over-loopback regression where connections were getting
      stuck.
      
      Ilpo Järvinen first spotted the locking problems.  The new function
      added by this code, tcp_defer_accept_check(), only has the
      child socket locked, yet it is modifying state of the parent
      listening socket.
      
      Fixing that is non-trivial at best, because we can't simply just grab
      the parent listening socket lock at this point, because it would
      create an ABBA deadlock.  The normal ordering is parent listening
      socket --> child socket, but this code path would require the
      reverse lock ordering.
      
      Next is a problem noticed by Vitaliy Gusev, he noted:
      
      ----------------------------------------
      >--- a/net/ipv4/tcp_timer.c
      >+++ b/net/ipv4/tcp_timer.c
      >@@ -481,6 +481,11 @@ static void tcp_keepalive_timer (unsigned long data)
      > 		goto death;
      > 	}
      >
      >+	if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) {
      >+		tcp_send_active_reset(sk, GFP_ATOMIC);
      >+		goto death;
      
      Here socket sk is not attached to listening socket's request queue. tcp_done()
      will not call inet_csk_destroy_sock() (and tcp_v4_destroy_sock() which should
      release this sk) as socket is not DEAD. Therefore socket sk will be lost for
      freeing.
      ----------------------------------------
      
      Finally, Alexey Kuznetsov argues that there might not even be any
      real value or advantage to these new semantics even if we fix all
      of the bugs:
      
      ----------------------------------------
      Hiding from accept() sockets with only out-of-order data only
      is the only thing which is impossible with old approach. Is this really
      so valuable? My opinion: no, this is nothing but a new loophole
      to consume memory without control.
      ----------------------------------------
      
      So revert this thing for now.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ec0a1966
    • D
      ipv6: Fix duplicate initialization of rawv6_prot.destroy · f23d60de
      David S. Miller 提交于
      In changeset 22dd4850
      ("raw: Raw socket leak.") code was added so that we
      flush pending frames on raw sockets to avoid leaks.
      
      The ipv4 part was fine, but the ipv6 part was not
      done correctly.  Unlike the ipv4 side, the ipv6 code
      already has a .destroy method for rawv6_prot.
      
      So now there were two assignments to this member, and
      what the compiler does is use the last one, effectively
      making the ipv6 parts of that changeset a NOP.
      
      Fix this by removing the:
      
      	.destroy	   = inet6_destroy_sock,
      
      line, and adding an inet6_destroy_sock() call to the
      end of raw6_destroy().
      
      Noticed by Al Viro.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Acked-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      f23d60de
  5. 12 6月, 2008 4 次提交
    • A
      net: remove CVS keywords · 0b040829
      Adrian Bunk 提交于
      This patch removes CVS keywords that weren't updated for a long time
      from comments.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0b040829
    • P
      netfilter: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info() · ceeff754
      Patrick McHardy 提交于
      When creation of a new conntrack entry in ctnetlink fails after having
      set up the NAT mappings, the conntrack has an extension area allocated
      that is not getting properly destroyed when freeing the conntrack again.
      This means the NAT extension is still in the bysource hash, causing a
      crash when walking over the hash chain the next time:
      
      BUG: unable to handle kernel paging request at 00120fbd
      IP: [<c03d394b>] nf_nat_setup_info+0x221/0x58a
      *pde = 00000000
      Oops: 0000 [#1] PREEMPT SMP
      
      Pid: 2795, comm: conntrackd Not tainted (2.6.26-rc5 #1)
      EIP: 0060:[<c03d394b>] EFLAGS: 00010206 CPU: 1
      EIP is at nf_nat_setup_info+0x221/0x58a
      EAX: 00120fbd EBX: 00120fbd ECX: 00000001 EDX: 00000000
      ESI: 0000019e EDI: e853bbb4 EBP: e853bbc8 ESP: e853bb78
       DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      Process conntrackd (pid: 2795, ti=e853a000 task=f7de10f0 task.ti=e853a000)
      Stack: 00000000 e853bc2c e85672ec 00000008 c0561084 63c1db4a 00000000 00000000
             00000000 0002e109 61d2b1c3 00000000 00000000 00000000 01114e22 61d2b1c3
             00000000 00000000 f7444674 e853bc04 00000008 c038e728 0000000a f7444674
      Call Trace:
       [<c038e728>] nla_parse+0x5c/0xb0
       [<c0397c1b>] ctnetlink_change_status+0x190/0x1c6
       [<c0397eec>] ctnetlink_new_conntrack+0x189/0x61f
       [<c0119aee>] update_curr+0x3d/0x52
       [<c03902d1>] nfnetlink_rcv_msg+0xc1/0xd8
       [<c0390228>] nfnetlink_rcv_msg+0x18/0xd8
       [<c0390210>] nfnetlink_rcv_msg+0x0/0xd8
       [<c038d2ce>] netlink_rcv_skb+0x2d/0x71
       [<c0390205>] nfnetlink_rcv+0x19/0x24
       [<c038d0f5>] netlink_unicast+0x1b3/0x216
       ...
      
      Move invocation of the extension destructors to nf_conntrack_free()
      to fix this problem.
      
      Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10875Reported-and-Tested-by: NKrzysztof Piotr Oledzki <ole@ans.pl>
      Signed-off-by: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ceeff754
    • E
      netfilter: Make nflog quiet when no one listen in userspace. · b66985b1
      Eric Leblond 提交于
      The message "nf_log_packet: can't log since no backend logging module loaded
      in! Please either load one, or disable logging explicitly" was displayed for
      each logged packet when no userspace application is listening to nflog events.
      The message seems to warn for a problem with a kernel module missing but as
      said before this is not the case. I thus propose to suppress the message (I
      don't see any reason to flood the log because a user application has crashed.)
      Signed-off-by: NEric Leblond <eric@inl.fr>
      Signed-off-by: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b66985b1
    • Y
      ipv6: Fail with appropriate error code when setting not-applicable sockopt. · 1717699c
      YOSHIFUJI Hideaki 提交于
      IPV6_MULTICAST_HOPS, for example, is not valid for stream sockets.
      Since they are virtually unavailable for stream sockets,
      we should return ENOPROTOOPT instead of EINVAL.
      Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      1717699c