1. 21 10月, 2011 3 次提交
    • E
      ip_gre: dont increase dev->needed_headroom on a live device · 113ab386
      Eric Dumazet 提交于
      It seems ip_gre is able to change dev->needed_headroom on the fly.
      
      Its is not legal unfortunately and triggers a BUG in raw_sendmsg()
      
      skb = sock_alloc_send_skb(sk, ... + LL_ALLOCATED_SPACE(rt->dst.dev)
      
      < another cpu change dev->needed_headromm (making it bigger)
      
      ...
      skb_reserve(skb, LL_RESERVED_SPACE(rt->dst.dev));
      
      We end with LL_RESERVED_SPACE() being bigger than LL_ALLOCATED_SPACE()
      -> we crash later because skb head is exhausted.
      
      Bug introduced in commit 243aad83 in 2.6.34 (ip_gre: include route
      header_len in max_headroom calculation)
      Reported-by: NElmar Vonlanthen <evonlanthen@gmail.com>
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      CC: Timo Teräs <timo.teras@iki.fi>
      CC: Herbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      113ab386
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · fd11e153
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Add alignment flag to PCI expansion resources
        sparc: Avoid calling sigprocmask()
        sparc: Use set_current_blocked()
        sparc32,leon: SRMMU MMU Table probe fix
      fd11e153
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 505f48b5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        fib_rules: fix unresolved_rules counting
        r8169: fix wrong eee setting for rlt8111evl
        r8169: fix driver shutdown WoL regression.
        ehea: Change maintainer to me
        pptp: pptp_rcv_core() misses pskb_may_pull() call
        tproxy: copy transparent flag when creating a time wait
        pptp: fix skb leak in pptp_xmit()
        bonding: use local function pointer of bond->recv_probe in bond_handle_frame
        smsc911x: Add support for SMSC LAN89218
        tg3: negate USE_PHYLIB flag check
        netconsole: enable netconsole can make net_device refcnt incorrent
        bluetooth: Properly clone LSM attributes to newly created child connections
        l2tp: fix a potential skb leak in l2tp_xmit_skb()
        bridge: fix hang on removal of bridge via netlink
        x25: Prevent skb overreads when checking call user data
        x25: Handle undersized/fragmented skbs
        x25: Validate incoming call user data lengths
        udplite: fast-path computation of checksum coverage
        IPVS netns shutdown/startup dead-lock
        netfilter: nf_conntrack: fix event flooding in GRE protocol tracker
      505f48b5
  2. 20 10月, 2011 6 次提交
  3. 19 10月, 2011 14 次提交
  4. 18 10月, 2011 11 次提交
  5. 17 10月, 2011 2 次提交
  6. 15 10月, 2011 4 次提交