1. 16 3月, 2012 4 次提交
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 538e7e96
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck.
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (zl6100) Enable interval between chip accesses for all chips
        hwmon: (w83627ehf) Describe undocumented pwm attributes
        hwmon: (w83627ehf) Fix temp2 source for W83627UHG
        hwmon: (w83627ehf) Fix memory leak in probe function
        hwmon: (w83627ehf) Fix writing into fan_stop_time for NCT6775F/NCT6776F
      538e7e96
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 0c48ca85
      Linus Torvalds 提交于
      Pull drm exynos/intel updates from Dave Airlie:
       "Two minor updates from Jesse for Intel SNB fixes, and a few fixes from
        Samsung for exynos.  The pull req has Alan's commit in it since Intel
        based their tree on my tree at that time, but it all seems fine wrt
        merging."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm exynos: use drm_fb_helper_set_par directly
        drm/exynos: Fix fb_videomode <-> drm_mode_modeinfo conversion
        drm/exynos: fix runtime_pm fimd device state on probe
        drm/exynos: use correct 'exynos-drm' name for platform device
        drm/i915: support 32 bit BGR formats in sprite planes
        drm/i915: fix color order for BGR formats on SNB
        drm/gma500: Fix Cedarview boot failures in 3.3-rc
      0c48ca85
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 72c79bdb
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "For 4 fixes for 3.3 (all trivial):
             - uvc video driver: fixes a division by zero;
             - davinci: add module.h to fix compilation;
             - smsusb: fix the delivery system setting;
             - smsdvb: the get_frontend implementation there is broken.
      
        The smsdvb patch has 127 lines, but it is trivial: instead of
        returning a cache of the set_frontend (with is wrong, as it doesn't
        have the updated values for the data, and the implementation there is
        buggy), it copies the information of the detected DVB parameters from
        the smsdvb private structures into the corresponding DVBv5 struct
        fields."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] smsdvb: fix get_frontend
        [media] smsusb: fix the default delivery system setting
        [media] media: davinci: added module.h to resolve unresolved macros
        [media] [FOR,v3.3] uvcvideo: Avoid division by 0 in timestamp calculation
      72c79bdb
    • L
      Merge branch '3.3-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · fe83558a
      Linus Torvalds 提交于
      Pull target fixes from Nicholas Bellinger:
       "This series addresses two recently reported regression bugs related to
        legacy SCSI reservation usage in target core, and iscsi-target
        reservation conflict handling.
      
        The second patch in particular addresses possible data-corruption with
        SCSI reservations that is specific to iscsi-target fabric LUNs with
        multiple client writers.  Both patches need to go into v3.2 stable
        ASAP, and the branch based on the last target-pending/3.3-rc-fixes
        HEAD.
      
        Again, thanks to Martin Svec for his help to identify and address this
        regression bug with iscsi-target."
      
      * '3.3-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        iscsi-target: Fix reservation conflict -EBUSY response handling bug
        target: Fix compatible reservation handling (CRH=1) with legacy RESERVE/RELEASE
      fe83558a
  2. 15 3月, 2012 11 次提交
  3. 14 3月, 2012 13 次提交
    • X
      block: fix ioc leak in put_io_context · ff8c1474
      Xiaotian Feng 提交于
      When put_io_context is called, if ioc->icq_list is empty and refcount
      is 1, kernel will not free the ioc.
      
      This is caught by following kmemleak:
      
      unreferenced object 0xffff880036349fe0 (size 216):
        comm "sh", pid 2137, jiffies 4294931140 (age 290579.412s)
        hex dump (first 32 bytes):
          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
          01 00 01 00 ad 4e ad de ff ff ff ff 00 00 00 00  .....N..........
        backtrace:
          [<ffffffff8169f926>] kmemleak_alloc+0x26/0x50
          [<ffffffff81195a9c>] kmem_cache_alloc_node+0x1cc/0x2a0
          [<ffffffff81356b67>] create_io_context_slowpath+0x27/0x130
          [<ffffffff81356d2b>] get_task_io_context+0xbb/0xf0
          [<ffffffff81055f0e>] copy_process+0x188e/0x18b0
          [<ffffffff8105609b>] do_fork+0x11b/0x420
          [<ffffffff810247f8>] sys_clone+0x28/0x30
          [<ffffffff816d3373>] stub_clone+0x13/0x20
          [<ffffffffffffffff>] 0xffffffffffffffff
      
      ioc should be freed if ioc->icq_list is empty.
      Signed-off-by: NXiaotian Feng <dannyfeng@tencent.com>
      Acked-by: NVivek Goyal <vgoyal@redhat.com>
      Acked-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      ff8c1474
    • N
      iscsi-target: Fix reservation conflict -EBUSY response handling bug · 00fdc6bb
      Nicholas Bellinger 提交于
      This patch addresses a iscsi-target specific bug related to reservation conflict
      handling in iscsit_handle_scsi_cmd() that has been causing reservation conflicts
      to complete and not fail as expected due to incorrect errno checking.  The problem
      occured with the change to return -EBUSY from transport_generic_cmd_sequencer() ->
      transport_generic_allocate_tasks() failures, that broke iscsit_handle_scsi_cmd()
      checking for -EINVAL in order to invoke a non GOOD status response.
      
      This was manifesting itself as data corruption with legacy SPC-2 reservations,
      but also effects iscsi-target LUNs with SPC-3 persistent reservations.
      
      This bug was originally introduced in lio-core commit:
      
      commit 03e98c9e
      Author: Nicholas Bellinger <nab@linux-iscsi.org>
      Date:   Fri Nov 4 02:36:16 2011 -0700
      
          target: Address legacy PYX_TRANSPORT_* return code breakage
      Reported-by: NMartin Svec <martin.svec@zoner.cz>
      Cc: Martin Svec <martin.svec@zoner.cz>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
      00fdc6bb
    • N
      target: Fix compatible reservation handling (CRH=1) with legacy RESERVE/RELEASE · 087a03b3
      Nicholas Bellinger 提交于
      This patch addresses a bug with target_check_scsi2_reservation_conflict()
      return checking in target_scsi2_reservation_[reserve,release]() that was
      preventing CRH=1 operation from silently succeeding in the two special
      cases defined by SPC-3, and not failing with reservation conflict status
      when dealing with legacy RESERVE/RELEASE + active SPC-3 PR logic.
      
      Also explictly set cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT during
      the early non reservation holder failure from pr_ops->t10_seq_non_holder()
      check in transport_generic_cmd_sequencer() for fabrics that already expect
      it to be set.
      
      This bug was originally introduced in mainline commit:
      
      commit eacac00c
      Author: Christoph Hellwig <hch@infradead.org>
      Date:   Thu Nov 3 17:50:40 2011 -0400
      
          target: split core_scsi2_emulate_crh
      Reported-by: NMartin Svec <martin.svec@zoner.cz>
      Cc: Martin Svec <martin.svec@zoner.cz>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
      087a03b3
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 762ad8a5
      Linus Torvalds 提交于
      Pull sparc updates from David Miller:
       "Please pull to get this fix for the sparc32 build when using a more
        recent binutils."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: Add -Av8 to assembler command line.
      762ad8a5
    • D
      sparc32: Add -Av8 to assembler command line. · e0adb990
      David S. Miller 提交于
      Newer version of binutils are more strict about specifying the
      correct options to enable certain classes of instructions.
      
      The sparc32 build is done for v7 in order to support sun4c systems
      which lack hardware integer multiply and divide instructions.
      
      So we have to pass -Av8 when building the assembler routines that
      use these instructions and get patched into the kernel when we find
      out that we have a v8 capable cpu.
      Reported-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e0adb990
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b8fa7d41
      Linus Torvalds 提交于
      Pull networking changes from David Miller:
       "The most important bit here is the TCP syncookies issue, which seems
        to have been busted for some time.  That fix has been verified in
        production by the reporter.
      
        1) Persistent TUN devices erroneously hold on to the network namespace
           in such a way that it cannot be shutdown.  Fix from Stanislav
           Kinsbursky with help from Eric Dumazet.
      
        2) TCP SYN cookies have been broken for a while due to how the route
           lookup flow key is managed, connections can be delayed by as much
           as 20 seconds due to this bug.  Fix from Eric Dumazet.
      
        3) Missing jiffies.h include in lib/dynamic_queue_limits.c can break
           the build, from Tom Herbert.
      
        4) Add USB device ID for Sitecom LN-031, from Joerg Neikes.
      
        5) Fix OOPS in delayed workqueue in iwlegacy, from Stanislaw Gruszka.
      
        6) rt2x00 TX queue can be disabled forever due to races, fix by
           synchronizing pause/unpause with a lock.  Also from Stanislaw
           Gruszka.
      
        7) Statistics and endian fix in bnx2x driver from Yuval Mintz, Eilon
           Greenstein, and Ariel Elior."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        tun: don't hold network namespace by tun sockets
        bnx2x: FCoE statistics id fixed
        bnx2x: dcb bit indices flags used as bits
        bnx2x: added cpu_to_le16 when preparing ramrod's data
        bnx2x: pfc statistics counts pfc events twice
        rt2x00: fix random stalls
        iwl3945: fix possible il->txq NULL pointer dereference in delayed works
        dql: Fix undefined jiffies
        tcp: fix syncookie regression
        usb: asix: Patch for Sitecom LN-031
      b8fa7d41
    • L
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 69539ab1
      Linus Torvalds 提交于
      Pull arch/tile update from Chris Metcalf
       "These include a couple of queued-up minor bug fixes from the
        community, a fix to unbreak the sysfs hooks in tile, and syncing up
        the defconfigs."
      
      Ugh.  defconfigs updates without "make minconfig".  Tons of ugly
      pointless lines there, I suspect.
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: Use set_current_blocked() and block_sigmask()
        arch/tile: misplaced parens near likely
        arch/tile: sync up the defconfig files to the tip
        arch/tile: Fix up from commit 8a25a2fd
      69539ab1
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0a49aeca
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf record: Fix buffer overrun bug in tracepoint_id_to_path()
        perf/x86: Fix local vs remote memory events for NHM/WSM
      0a49aeca
    • L
      Merge git://git.samba.org/sfrench/cifs-2.6 · 8e8bb96d
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French.
      
      * git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Do not kmalloc under the flocks spinlock
        cifs: possible memory leak in xattr.
      8e8bb96d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · cd794539
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro:
       "A bunch of assorted fixes; Jan's freezing stuff still _not_ in there
        and neither is mm fun ;-/"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        restore smp_mb() in unlock_new_inode()
        vfs: fix return value from do_last()
        vfs: fix double put after complete_walk()
        udf: Fix deadlock in udf_release_file()
        vfs: Correctly set the dir i_mutex lockdep class
      cd794539
    • M
      tile: Use set_current_blocked() and block_sigmask() · ad092338
      Matt Fleming 提交于
      As described in e6fa16ab ("signal: sigprocmask() should do
      retarget_shared_pending()") the modification of current->blocked is
      incorrect as we need to check whether the signal we're about to block
      is pending in the shared queue.
      
      Also, use the new helper function introduced in commit 5e6292c0
      ("signal: add block_sigmask() for adding sigmask to current->blocked")
      which centralises the code for updating current->blocked after
      successfully delivering a signal and reduces the amount of duplicate
      code across architectures. In the past some architectures got this
      code wrong, so using this helper function should stop that from
      happening again.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Acked-by: NOleg Nesterov <oleg@redhat.com>
      Signed-off-by: NMatt Fleming <matt.fleming@intel.com>
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      ad092338
    • J
      Merge branch 'master' of... · 750084b5
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      750084b5
    • S
      perf record: Fix buffer overrun bug in tracepoint_id_to_path() · 8aa8a7c8
      Stephane Eranian 提交于
      This patch fixes a buffer overrun bug in
      tracepoint_id_to_path(). The bug manisfested itself as a memory
      error reported by perf record. I ran into it with perf sched:
      
       $ perf sched rec noploop 2 noploop for 2 seconds
       [ perf record: Woken up 14 times to write data ]
       [ perf record: Captured and wrote 42.701 MB perf.data (~1865622 samples) ]
       Fatal: No memory to alloc tracepoints list
      
      It turned out that tracepoint_id_to_path() was reading the
      tracepoint id using read() but the buffer was not large enough
      to include the \n terminator for id with 4 digits or more.
      
      The patch fixes the problem by extending the buffer to a more
      reasonable size covering all possible id length include \n
      terminator. Note that atoll() stops at the first non digit
      character, thus it is not necessary to clear the buffer between
      each read.
      Signed-off-by: NStephane Eranian <eranian@google.com>
      Acked-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Acked-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: fweisbec@gmail.com
      Cc: dsahern@gmail.com
      Link: http://lkml.kernel.org/r/20120313155102.GA6465@quadSigned-off-by: NIngo Molnar <mingo@elte.hu>
      8aa8a7c8
  4. 13 3月, 2012 12 次提交