1. 16 May, 2012 9 commits
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 39d6411b
      Linus Torvalds authored
      Pull two Tile arch fixes from Chris Metcalf:
       "These are both bug-fixes, one to avoid some issues in how we invoke
        the "pending userspace work" flags on return to userspace, and the
        other to provide the same signal handler arguments for tilegx32 that
        we do for tilegx64."
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        arch/tile: apply commit 74fca9da to the compat signal handling as well
        arch/tile: fix up some issues in calling do_work_pending()
      39d6411b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 80116529
      Linus Torvalds authored
      Pull networking tree from David Miller:
      
      1) ptp_pch driver build broke during this merge window due to missing
         slab.h header, fix from Geery Uytterhoeven.
      
      2) If ipset passes in a bogus hash table size we crash because the size
         is not validated properly.  Compounding this, gcc-4.7 can miscompile
         ipset such that even when the user specifies legitimate parameters
         the tool passes in an out-of-range size to the kernel.
      
         Fix from Jozsef Kadlecsik.
      
      3) Users have reported that the netdev watchdog can trigger with pch_gbe
         devices, and it turns out this is happening because of races in the
         TX path of the driver leading to the transmitter hanging.  Fix from
         Eric Dumazet, reported and tested by Andy Cress.
      
      4) Novatel USB551L devices match the generic class entries for the cdc
         ethernet USB driver, but they don't work because they have generic
         descriptors and thus need FLAG_WWAN to function properly.
      
         Add the necessary ID table entry to fix this, from Dan Williams.
      
      5) A recursive locking fix in the USBNET driver added a new problem, in
         that packet list traversal is now racy and we can thus access
         unlinked SKBs and crash.
      
         Avoid this situation by adding some extra state tracking, from Ming
         Lei.
      
      6) The rtlwifi conversion to asynchronous firmware loading is racy, fix
         by reordering the probe procedure.  From Larry Finger.
      
         Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=43187
      
      7) Fix regressions with bluetooth keyboards by notifying userland
         properly when the security level changes, from Gustavo Padovan.
      
      8) Bluetooth needs to make sure device connected events are emitted
         before other kinds of events, otherwise userspace will think there is
         no baseband link yet and therefore abort the sockets associated with
         that connection.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netfilter: ipset: fix hash size checking in kernel
        ptp_pch: Add missing #include <linux/slab.h>
        pch_gbe: fix transmit races
        cdc_ether: add Novatel USB551L device IDs for FLAG_WWAN
        usbnet: fix skb traversing races during unlink(v2)
        Bluetooth: mgmt: Fix device_connected sending order
        Bluetooth: notify userspace of security level change
        rtlwifi: fix for race condition when firmware is cached
      80116529
    • Chris Metcalf's avatar
      arch/tile: apply commit 74fca9da to the compat signal handling as well · a134d228
      Chris Metcalf authored
      This passes siginfo and mcontext to tilegx32 signal handlers that
      don't have SA_SIGINFO set just as we have been doing for tilegx64.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      a134d228
    • Chris Metcalf's avatar
      arch/tile: fix up some issues in calling do_work_pending() · fc327e26
      Chris Metcalf authored
      First, we were at risk of handling thread-info flags, in particular
      do_signal(), when returning from kernel space.  This could happen
      after a failed kernel_execve(), or when forking a kernel thread.
      The fix is to test in do_work_pending() for user_mode() and return
      immediately if so; we already had this test for one of the flags,
      so I just hoisted it to the top of the function.
      
      Second, if a ptraced process updated the callee-saved registers
      in the ptregs struct and then processed another thread-info flag, we
      would overwrite the modifications with the original callee-saved
      registers.  To fix this, we add a register to note if we've already
      saved the registers once, and skip doing it on additional passes
      through the loop.  To avoid a performance hit from the couple of
      extra instructions involved, I modified the GET_THREAD_INFO() macro
      to be guaranteed to be one instruction, then bundled it with adjacent
      instructions, yielding an overall net savings.
      Reported-By: default avatarAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      fc327e26
    • Jozsef Kadlecsik's avatar
      netfilter: ipset: fix hash size checking in kernel · 26a5d3cc
      Jozsef Kadlecsik authored
      The hash size must fit both into u32 (jhash) and the max value of
      size_t. The missing checking could lead to kernel crash, bug reported
      by Seblu.
      Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      26a5d3cc
    • Geert Uytterhoeven's avatar
      ptp_pch: Add missing #include <linux/slab.h> · 769b0daf
      Geert Uytterhoeven authored
      drivers/ptp/ptp_pch.c: In function 'pch_remove':
      drivers/ptp/ptp_pch.c:576:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
      drivers/ptp/ptp_pch.c: In function 'pch_probe':
      drivers/ptp/ptp_pch.c:587:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      769b0daf
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · d0cad88d
      David S. Miller authored
      John Linville says:
      
      Here are three more fixes that some of my developers are desperate to
      see included in 3.4...
      
      Johan Hedberg went to some length justifyng the inclusion of these two
      Bluetooth fixes:
      
      "The device_connected fix should be quite self-explanatory, but it's
      actually a wider issue than just for keyboards. All profiles that do
      incoming connection authorization (e.g. headsets) will break without it
      with specific hardware. The reason it wasn't caught earlier is that it
      only occurs with specific Bluetooth adapters.
      
      As for the security level patch, this fixes L2CAP socket based security
      level elevation during a connection. The HID profile needs this (for
      keyboards) and it is the only way to achieve the security level
      elevation when using the management interface to talk to the kernel
      (hence the management enabling patch being the one that exposes this"
      
      The rtlwifi fix addresses a regression related to firmware loading,
      as described in kernel.org bug 43187.  It basically just moves a hunk
      of code to a more appropriate place.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d0cad88d
    • Srivatsa S. Bhat's avatar
      mn10300/CPU hotplug: Add missing call to notify_cpu_starting() · 568b4455
      Srivatsa S. Bhat authored
      The scheduler depends on receiving the CPU_STARTING notification, without
      which we end up into a lot of trouble. So add the missing call to
      notify_cpu_starting() in the bringup code.
      Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      568b4455
    • Srivatsa S. Bhat's avatar
      parisc/CPU hotplug: Add missing call to notify_cpu_starting() · ec2e0f98
      Srivatsa S. Bhat authored
      The scheduler depends on receiving the CPU_STARTING notification, without
      which we end up into a lot of trouble. So add the missing call to
      notify_cpu_starting() in the bringup code.
      Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-and-Tested-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Acked-and-Tested-by: default avatarTobias Ulmer <tobiasu@tmux.org>
      Tested-by: default avatarJohn David Anglin <dave.anglin@bell.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ec2e0f98
  2. 15 May, 2012 5 commits
  3. 14 May, 2012 6 commits
  4. 13 May, 2012 6 commits
  5. 12 May, 2012 14 commits