1. 23 8月, 2012 2 次提交
  2. 21 8月, 2012 4 次提交
  3. 19 8月, 2012 20 次提交
  4. 18 8月, 2012 14 次提交
    • L
      Merge tag 'md-3.6-fixes' of git://neil.brown.name/md · 1ce41cd8
      Linus Torvalds 提交于
      Pull md fixes from NeilBrown:
       "2 fixes for md, tagged for -stable"
      
      * tag 'md-3.6-fixes' of git://neil.brown.name/md:
        md/raid10: fix problem with on-stack allocation of r10bio structure.
        md: Don't truncate size at 4TB for RAID0 and Linear
      1ce41cd8
    • N
      md/raid10: fix problem with on-stack allocation of r10bio structure. · e0ee7785
      NeilBrown 提交于
      A 'struct r10bio' has an array of per-copy information at the end.
      This array is declared with size [0] and r10bio_pool_alloc allocates
      enough extra space to store the per-copy information depending on the
      number of copies needed.
      
      So declaring a 'struct r10bio on the stack isn't going to work.  It
      won't allocate enough space, and memory corruption will ensue.
      
      So in the two places where this is done, declare a sufficiently large
      structure and use that instead.
      
      The two call-sites of this bug were introduced in 3.4 and 3.5
      so this is suitable for both those kernels.  The patch will have to
      be modified for 3.4 as it only has one bug.
      
      Cc: stable@vger.kernel.org
      Reported-by: NIvan Vasilyev <ivan.vasilyev@gmail.com>
      Tested-by: NIvan Vasilyev <ivan.vasilyev@gmail.com>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      e0ee7785
    • L
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 846b9996
      Linus Torvalds 提交于
      Pull infiniband/rdma fixes from Roland Dreier:
       "Grab bag of InfiniBand/RDMA fixes:
         - IPoIB fixes for regressions introduced by path database conversion
         - mlx4 fixes for bugs with large memory systems and regressions from
           SR-IOV patches
         - RDMA CM fix for passing bad event up to userspace
         - Other minor fixes"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mlx4: Check iboe netdev pointer before dereferencing it
        mlx4_core: Clean up buddy bitmap allocation
        mlx4_core: Fix integer overflow issues around MTT table
        mlx4_core: Allow large mlx4_buddy bitmaps
        IB/srp: Fix a race condition
        IB/qib: Fix error return code in qib_init_7322_variables()
        IB: Fix typos in infiniband drivers
        IB/ipoib: Fix RCU pointer dereference of wrong object
        IB/ipoib: Add missing locking when CM object is deleted
        RDMA/ucma.c: Fix for events with wrong context on iWARP
        RDMA/ocrdma: Don't call vlan_dev_real_dev() for non-VLAN netdevs
        IB/mlx4: Fix possible deadlock on sm_lock spinlock
      846b9996
    • L
      Merge tag 'tty-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 225a389b
      Linus Torvalds 提交于
      Pull TTY fixes from Greg Kroah-Hartman:
       "Here are 4 tiny patches, each fixing a serial driver problem that
        people have reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        pmac_zilog,kdb: Fix console poll hook to return instead of loop
        serial: mxs-auart: fix the wrong RTS hardware flow control
        serial: ifx6x60: fix paging fault on spi_register_driver
        serial: Change Kconfig entry for CLPS711X-target
      225a389b
    • K
      intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it. · 3735d524
      Konrad Rzeszutek Wilk 提交于
      If the machine is booted without any cpu_idle driver set
      (b/c disable_cpuidle() has been called) we should follow
      other users of cpu_idle API and check the return value
      for NULL before using it.
      Reported-and-tested-by: NMark van Dijk <mark@internecto.net>
      Suggested-by: NJan Beulich <JBeulich@suse.com>
      Signed-off-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      3735d524
    • J
      cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify · 5fbbb90d
      Jon Medhurst (Tixy) 提交于
      When a kernel is built to support multiple hardware types it's possible
      that CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is set but the hardware the
      kernel is run on doesn't support cpuidle and therefore doesn't load a
      driver for it. In this case, when the system is shut down,
      cpuidle_coupled_cpu_notify() gets called with cpuidle_devices set to
      NULL. There are quite possibly other circumstances where this
      situation can also occur and we should check for it.
      Signed-off-by: NJon Medhurst <tixy@linaro.org>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      5fbbb90d
    • C
      cpuidle: coupled: fix sleeping while atomic in cpu notifier · 63c6ba43
      Colin Cross 提交于
      The cpu hotplug notifier gets called in both atomic and non-atomic
      contexts, it is not always safe to lock a mutex.  Filter out all events
      except the six necessary ones, which are all sleepable, before taking
      the mutex.
      Signed-off-by: NColin Cross <ccross@android.com>
      Reviewed-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      63c6ba43
    • R
      PM / Runtime: Check device PM QoS setting before "no callbacks" check · 55d7ec45
      Rafael J. Wysocki 提交于
      If __dev_pm_qos_read_value(dev) returns a negative value,
      rpm_suspend() should return -EPERM for dev even if its
      power.no_callbacks flag is set.  For this to happen, the device's
      power.no_callbacks flag has to be checked after the PM QoS check,
      so move the PM QoS check to rpm_check_suspend_allowed() (this will
      make it cover idle notifications as well as runtime suspend too).
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: stable@vger.kernel.org
      55d7ec45
    • R
      PM / Runtime: Clear power.deferred_resume on success in rpm_suspend() · 58a34de7
      Rafael J. Wysocki 提交于
      The power.deferred_resume can only be set if the runtime PM status
      of device is RPM_SUSPENDING and it should be cleared after its
      status has been changed, regardless of whether or not the runtime
      suspend has been successful.  However, it only is cleared on
      suspend failure, while it may remain set on successful suspend and
      is happily leaked to rpm_resume() executed in that case.
      
      That shouldn't happen, so if power.deferred_resume is set in
      rpm_suspend() after the status has been changed to RPM_SUSPENDED,
      clear it before calling rpm_resume().  Then, it doesn't need to be
      cleared before changing the status to RPM_SUSPENDING any more,
      because it's always cleared after the status has been changed to
      either RPM_SUSPENDED (on success) or RPM_ACTIVE (on failure).
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: stable@vger.kernel.org
      58a34de7
    • R
      PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set · 7f321c26
      Rafael J. Wysocki 提交于
      For devices whose power.no_callbacks flag is set, rpm_resume()
      should return 1 if the device's parent is already active, so that
      the callers of pm_runtime_get() don't think that they have to wait
      for the device to resume (asynchronously) in that case (the core
      won't queue up an asynchronous resume in that case, so there's
      nothing to wait for anyway).
      
      Modify the code accordingly (and make sure that an idle notification
      will be queued up on success, even if 1 is to be returned).
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: stable@vger.kernel.org
      7f321c26
    • L
      Merge tag 'staging-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 557e2e2e
      Linus Torvalds 提交于
      Pull staging fixes from Greg Kroah-Hartman:
       "Here are some staging driver fixes (and iio driver fixes, they get
        lumped in with the staging stuff due to dependancies) for your 3.6-rc3
        tree.
      
        Nothing major, just a bunch of fixes that people have reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (26 commits)
        iio: lm3533-als: Fix build warnings
        staging:iio:ad7780: Mark channels as unsigned
        staging:iio:ad7192: Report offset and scale for temperature channel
        staging:iio:ad7192: Report channel offset
        staging:iio:ad7192: Mark channels as unsigned
        staging:iio:ad7192: Fix setting ACX
        staging:iio:ad7192: Add missing break in switch statement
        staging:iio:ad7793: Fix internal reference value
        staging:iio:ad7793: Follow new IIO naming spec
        staging:iio:ad7793: Fix temperature scale and offset
        staging:iio:ad7793: Report channel offset
        staging:iio:ad7793: Mark channels as unsigned
        staging:iio:ad7793: Add missing break in switch statement
        iio/adjd_s311: Fix potential memory leak in adjd_s311_update_scan_mode()
        iio: frequency: ADF4350: Fix potential reference div factor overflow.
        iio: staging: ad7298_ring: Fix maybe-uninitialized warning
        staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usage
        staging: comedi: usbdux: Declare MODULE_FIRMWARE usage
        staging: comedi: usbduxsigma: Declare MODULE_FIRMWARE usage
        staging: csr: add INET dependancy
        ...
      557e2e2e
    • L
      Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · c8391797
      Linus Torvalds 提交于
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are two tiny patches, one fixing a dynamic debug problem that the
        printk rework turned up, and the other one fixing an extcon problem
        that people reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
        drivers-core: make structured logging play nice with dynamic-debug
      c8391797
    • L
      Merge tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · d7d45fed
      Linus Torvalds 提交于
      Pull Char / Misc driver fixes from Greg Kroah-Hartman:
       "Here are some small misc and w1 driver fixes for 3.6-rc3.  Nothing
        major, just some some bugfixes and a new device id for a w1 driver.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        1-Wire: Add support for the maxim ds1825 temperature sensor
        ti-st: Fix check for pdata->chip_awake function pointer
        mei: add mei_quirk_probe function
        mei: fix device stall after wd is stopped
      d7d45fed
    • L
      Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 9134e7d2
      Linus Torvalds 提交于
      Pull USB patches from Greg Kroah-Hartman:
       "Here are a number of small USB patches for 3.6-rc3.
      
        The "large" one is just a number of device id updates to the option
        driver, done by the manufacturer, properly fixing up the device ids
        based on shipping devices.
      
        Other than that, some gadget driver fixes, the obligitary XHCI
        patches, and some other device ids and bugs fixed.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
        USB: qcserial: fix port handling on Gobi 1K and 2K+
        USB: serial: Fix mos7840 timeout
        USB: option: add ZTE K5006-Z
        usb: gadget: u_ether: fix kworker 100% CPU issue with still used interfaces in eth_stop
        usb: host: tegra: fix warning messages in ehci_remove
        usb: host: mips: sead3: Update for EHCI register structure.
        usb: renesas_usbhs: fixup resume method for autonomy mode
        usb: renesas_usbhs: mod_host: add missing .bus_suspend/resume
        update MAINTAINERS for Oliver Neukum
        usb: usb_wwan: resume/suspend can be called after port is gone
        usb: serial: prevent suspend/resume from racing against probe/remove
        usb: usb_wwan: replace release and disconnect with a port_remove hook
        usb: serial: mos7840: Fixup mos7840_chars_in_buffer()
        USB: isp1362-hcd.c: usb message always saved in case of underrun
        OMAP: USB : Fix the EHCI enumeration and core retention issue
        usb: chipidea: fix and improve dependencies if usb host or gadget support is built as module
        USB: support the new interfaces of Huawei Data Card devices in option driver
        USB: ftdi_sio: Add VID/PID for Kondo Serial USB
        xhci: Switch PPT ports to EHCI on shutdown.
        xhci: Fix bug after deq ptr set to link TRB.
        ...
      9134e7d2