1. 29 Mar, 2013 6 commits
  2. 28 Mar, 2013 3 commits
    • David S. Miller's avatar
      Merge branch 'wireless' · d2aa8eec
      David S. Miller authored
      John W. Linville says:
      
      ====================
      Please excuse this larger-than-I-would-like pull request intended
      for the 3.9 stream.  There are a number of late-breaking fixes,
      including a revert...
      
      Regarding the mac80211 bits, Johannes says:
      
      "I have two tracing fixes (one from Vladimir), two fixes for P2P device
      crashes, a fix for a BSS memory leak/lost update problem and a fix from
      Ben for a scanning issue in mac80211. It's a little on the large side
      because one of the P2P device problems required a bit much locking work,
      but I've run through all the different scenarios (wext/nl80211,
      p2p-device/station interface, ifdown/rfkill) to verify locking with
      lockdep."
      
      As for the iwlwifi bits, Johannes says:
      
      "I have three little fixes to the driver from Emmanuel. One addresses a
      small bug Ben Hutchings found during the stable review process and two
      address some warnings in the driver when RF-Kill is asserted."
      
      Along with those...
      
      Avinash Patil fixes an mwifiex bug cause by failing to process a sleep
      command due to bad SKB manipulation when going into power saving mode.
      
      Colin Ian King avoids a null pointer dereference in iwl4965.
      
      Dan Williams officially announces that he has dropped maintainership
      of the libertas driver.
      
      Iestyn C. Elfick adds a work-around to avoid b43 DMA transmision
      sequence error that would lead to a device reset.
      
      Luis R. Rodriguez avoids an ath9k warning by not queueing a work item
      while going to suspend mode.
      
      Rafał Miłecki provides a pair of b43 N-PHY fixes related to RSSI
      calibration.
      
      Finally, I revert "brcmsmac: support 4313iPA" because it has been
      reported in many places to cause problems with the already supported
      4313ePA devices.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d2aa8eec
    • John W. Linville's avatar
      Merge branch 'master' of... · 630a216d
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      630a216d
    • Eric Dumazet's avatar
      aoe: reserve enough headroom on skbs · 91c57464
      Eric Dumazet authored
      Some network drivers use a non default hard_header_len
      
      Transmitted skb should take into account dev->hard_header_len, or risk
      crashes or expensive reallocations.
      
      In the case of aoe, lets reserve MAX_HEADER bytes.
      
      David reported a crash in defxx driver, solved by this patch.
      Reported-by: default avatarDavid Oostdyk <daveo@ll.mit.edu>
      Tested-by: default avatarDavid Oostdyk <daveo@ll.mit.edu>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Ed Cashin <ecashin@coraid.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91c57464
  3. 27 Mar, 2013 28 commits
  4. 26 Mar, 2013 3 commits
    • Al Viro's avatar
      Nest rename_lock inside vfsmount_lock · 7ea600b5
      Al Viro authored
      ... lest we get livelocks between path_is_under() and d_path() and friends.
      
      The thing is, wrt fairness lglocks are more similar to rwsems than to rwlocks;
      it is possible to have thread B spin on attempt to take lock shared while thread
      A is already holding it shared, if B is on lower-numbered CPU than A and there's
      a thread C spinning on attempt to take the same lock exclusive.
      
      As the result, we need consistent ordering between vfsmount_lock (lglock) and
      rename_lock (seq_lock), even though everything that takes both is going to take
      vfsmount_lock only shared.
      Spotted-by: default avatarBrad Spengler <spender@grsecurity.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      7ea600b5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b175293c
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Always increment IPV4 ID field in encapsulated GSO packets, even
          when DF is set.  Regression fix from Pravin B Shelar.
      
       2) Fix per-net subsystem initialization in netfilter conntrack,
          otherwise we may access dynamically allocated memory before it is
          actually allocated.  From Gao Feng.
      
       3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.
      
       4) Fix race between submission of sync vs async commands in mwifiex
          driver, from Amitkumar Karwar.
      
       5) Add missing cancel of command timer in mwifiex driver, from Bing
          Zhao.
      
       6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.
      
       7) Thermal layer tries to use a genetlink multicast string that is
          longer than the 16 character limit.  Fix it and add a BUG check to
          prevent this kind of thing from happening in the future.
      
       From Masatake YAMATO.
      
       8) Fix many bugs in the handling of the teardown of L2TP connections,
          UDP encapsulation instances, and sockets.  From Tom Parkin.
      
       9) Missing socket release in IRDA, from Kees Cook.
      
      10) Fix fec driver modular build, from Fabio Estevam.
      
      11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,
          from Wei Yongjun.
      
      12) Fix bugs in handling of queue numbers and steering rules in mlx4
          driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.
      
      13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey
          Vagin.
      
      14) TCP segmentation deferral is unintentionally done too strongly,
          breaking ACK clocking.  Fix from Eric Dumazet.
      
      15) net_enable_timestamp() can legitimately be invoked from software
          interrupts, and in a way that is safe, so remove the WARN_ON().
          Also from Eric Dumazet.
      
      16) Fix use after free in VLANs, from Cong Wang.
      
      17) Fix TCP slow start retransmit storms after SACK reneging, from
          Yuchung Cheng.
      
      18) Unix socket release should mark a socket dead before NULL'ing out
          sock->sk, otherwise we can race.  Fix from Paul Moore.
      
      19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.
      
      20) Fix register mis-programming, NULL pointer derefs, and wrong PHC
          clock frequency in IGB driver.  From Lior LevyAlex Williamson, Jiri
          Benc, and Jeff Kirsher.
      
      21) skb->ip_summed logic in pch_gbe driver is reversed, breaking packet
          forwarding.  Fix from Veaceslav Falico.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
        ipv4: Fix ip-header identification for gso packets.
        bonding: remove already created master sysfs link on failure
        af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
        pch_gbe: fix ip_summed checksum reporting on rx
        igb: fix PHC stopping on max freq
        igb: make sensor info static
        igb: SR-IOV init reordering
        igb: Fix null pointer dereference
        igb: fix i350 anti spoofing config
        ixgbevf: don't release the soft entries
        ipv6: fix bad free of addrconf_init_net
        unix: fix a race condition in unix_release()
        tcp: undo spurious timeout after SACK reneging
        bnx2x: fix assignment of signed expression to unsigned variable
        bridge: fix crash when set mac address of br interface
        8021q: fix a potential use-after-free
        net: remove a WARN_ON() in net_enable_timestamp()
        tcp: preserve ACK clocking in TSO
        net: fix *_DIAG_MAX constants
        net/mlx4_core: Disallow releasing VF QPs which have steering rules
        ...
      b175293c
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 5d538483
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       - Fix an NFSv4 idmapper regression
       - Fix an Oops in the pNFS blocks client
       - Fix up various issues with pNFS layoutcommit
       - Ensure correct read ordering of variables in
         rpc_wake_up_task_queue_locked
      
      * tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
        NFSv4.1: Add a helper pnfs_commit_and_return_layout
        NFSv4.1: Always clear the NFS_INO_LAYOUTCOMMIT in layoutreturn
        NFSv4.1: Fix a race in pNFS layoutcommit
        pnfs-block: removing DM device maybe cause oops when call dev_remove
        NFSv4: Fix the string length returned by the idmapper
      5d538483