1. 08 Jan, 2013 1 commit
    • Trond Myklebust's avatar
      SUNRPC: Ensure we release the socket write lock if the rpc_task exits early · 87ed5003
      Trond Myklebust authored
      If the rpc_task exits while holding the socket write lock before it has
      allocated an rpc slot, then the usual mechanism for releasing the write
      lock in xprt_release() is defeated.
      
      The problem occurs if the call to xprt_lock_write() initially fails, so
      that the rpc_task is put on the xprt->sending wait queue. If the task
      exits after being assigned the lock by __xprt_lock_write_func, but
      before it has retried the call to xprt_lock_and_alloc_slot(), then
      it calls xprt_release() while holding the write lock, but will
      immediately exit due to the test for task->tk_rqstp != NULL.
      Reported-by: default avatarChris Perl <chris.perl@gmail.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Cc: stable@vger.kernel.org [>= 3.1]
      87ed5003
  2. 07 Jan, 2013 12 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d287b875
      Linus Torvalds authored
      Pull namei.h missing include fix from Al Viro.
      
      The new use of ESTALE in namei.h can cause compile failures on ARM with
      certain configurations due to lack of errno.h.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        namei.h: include errno.h
      d287b875
    • Alex Elder's avatar
      sctp: fix Kconfig bug in default cookie hmac selection · 36a25de2
      Alex Elder authored
      Commit 0d0863b0 ("sctp: Change defaults on cookie hmac selection")
      added a "choice" to the sctp Kconfig file.  It introduced a bug which
      led to an infinite loop when while running "make oldconfig".
      
      The problem is that the wrong symbol was defined as the default value
      for the choice.  Using the correct value gets rid of the infinite loop.
      
      Note:  if CONFIG_SCTP_COOKIE_HMAC_SHA1=y was present in the input
      config file, both that and CONFIG_SCTP_COOKIE_HMAC_MD5=y be present
      in the generated config file.
      Signed-off-by: default avatarAlex Elder <elder@inktank.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      36a25de2
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · f7763720
      Linus Torvalds authored
      Pull ext4 regression fixes from Ted Ts'o:
       "Bug fixes, including two regressions introduced in v3.8.  The most
        serious of these regressions is a buffer cache leak."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()
        ext4: release buffer in failed path in dx_probe()
        ext4: fix configuration dependencies for ext4 ACLs and security labels
      f7763720
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 4c9014f2
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix a permissions problem when opening NFSv4 files that only have the
         exec bit set.
      
       - Fix a couple of typos in pNFS (inverted logic), and the mount parsing
         (missing pointer dereference).
      
       - Work around a series of deadlock issues due to workqueues using
         struct work_struct pointer address comparisons in the re-entrancy
         tests.  Ensure that we don't free struct work_struct prematurely if
         our work function involves waiting for completion of other work items
         (e.g. by calling rpc_shutdown_client).
      
       - Revert the part of commit 168e4b39 that is causing unnecessary
         warnings to be issued in the nfsd callback code.
      
      * tag 'nfs-for-3.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: avoid dereferencing null pointer in initiate_bulk_draining
        SUNRPC: Partial revert of commit 168e4b39
        NFS: Ensure that we free the rpc_task after read and write cleanups are done
        SUNRPC: Ensure that we free the rpc_task after cleanups are done
        nfs: fix null checking in nfs_get_option_str()
        pnfs: Increase the refcount when LAYOUTGET fails the first time
        NFS: Fix access to suid/sgid executables
      4c9014f2
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 5ce2955e
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Various fixes across the tree.  The modpost error due to
        virt_addr_valid() not being usable from modules required a number of
        preparatory cleanups so a clean fix was possible."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: 64-bit: Fix build if !CONFIG_MODULES
        MIPS: Wire up finit_module syscall.
        MIPS: Fix modpost error in modules attepting to use virt_addr_valid().
        MIPS: page.h: Remove now unnecessary #ifndef __ASSEMBLY__ wrapper.
        MIPS: Switch remaining assembler PAGE_SIZE users to <asm/asm-offsets.h>.
        MIPS: Include PAGE_S{IZE,HIFT} in <asm/offset.h>.
        MIPS: Don't include <asm/page.h> unnecessarily.
        MIPS: Fix comment.
        Revert "MIPS: Optimise TLB handlers for MIPS32/64 R2 cores."
        MIPS: perf: Fix build failure in XLP perf support.
        MIPS: Alchemy: Make 32kHz and r4k timer coexist peacefully
      5ce2955e
    • Linus Torvalds's avatar
      Merge branch 'akpm' (fixes from Andrew) · d0631c6e
      Linus Torvalds authored
      Merge emailed fixes from Andrew Morton:
       "Bunch of fixes:
      
         - delayed IPC updates.  I held back on this because of some possible
           outstanding bug reports, but they appear to have been addressed in
           later versions
      
         - A bunch of MAINTAINERS updates
      
         - Yet Another RTC driver.  I'd held this back while a couple of
           little issues were being worked out.
      
        I'm expecting an intrusive-but-simple patchset from Joe Perches which
        splits up printk.c into kernel/printk/*.  That will be a pig to
        maintain for two months so if it passes testing I'd like to get it
        upstream after a week or so."
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
        printk: fix incorrect length from print_time() when seconds > 99999
        drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
        drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
        rtc: add RTC driver for TPS6586x
        MAINTAINERS: fix drivers/staging/sm7xx/
        MAINTAINERS: remove include/linux/of_pwm.h
        MAINTAINERS: remove arch/*/lib/perf_event*.c
        MAINTAINERS: remove drivers/mmc/host/imxmmc.*
        MAINTAINERS: fix Documentation/mei/
        MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
        MAINTAINERS: remove firmware/isci/
        MAINTAINERS: fix drivers/ieee802154/
        MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
        MAINTAINERS: remove drivers/video/epson1355fb.c
        MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
        MAINTAINERS: adjust for UAPI
        MAINTAINERS: fix drivers/media/platform/atmel-isi.c
        MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
        MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
        MAINTAINERS: remove arch/arm/plat-s5p/
        ...
      d0631c6e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · de9ac5ce
      Linus Torvalds authored
      Pull microblaze update from Michal Simek:
       "This fixes noMMU kernel and I have also added defconfig updates which
        fix issue with one external dependency and enable all xilinx device
        drivers for 0-day testing system.
      
        Additionally wire up finit_module system call, and do highmem fixup
        and pci warnings reported by the 0-day testing system"
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Update microblaze defconfigs
        microblaze: Fix pci compilation and sparse warnings
        microblaze: Add finit_module syscall
        microblaze: Kill __kmap_atomic()
        microblaze: Change section flags for noMMU
        microblaze: Microblaze wants sys_fork for noMMU too
      de9ac5ce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 7991b03d
      Linus Torvalds authored
      Pull integrity subsystem regression fix from James Morris:
       "Commit fdf90729 "ima: support new kernel module syscall" by error
        modified init_module() to return INTEGRITY_UNKNOWN (which is 4) to
        user space if the kernel was built with CONFIG_IMA_APPRAISE=y.
      
        As a result, user space can no longer load kernel modules using
        init_module().  This commit fixes this regression."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: fallback to MODULE_SIG_ENFORCE for existing kernel module syscall
      7991b03d
    • Guo Chao's avatar
      ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir() · fef0ebdb
      Guo Chao authored
      This fixes a buffer cache leak when creating a directory, introduced
      in commit a774f9c2.
      Signed-off-by: default avatarGuo Chao <yan@linux.vnet.ibm.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: default avatarTao Ma <boyu.mt@taobao.com>
      fef0ebdb
    • Guo Chao's avatar
      ext4: release buffer in failed path in dx_probe() · 0ecaef06
      Guo Chao authored
      If checksum fails, we should also release the buffer
      read from previous iteration.
      Signed-off-by: default avatarGuo Chao <yan@linux.vnet.ibm.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>-
      Cc: stable@vger.kernel.org
      --
       fs/ext4/namei.c |    2 +-
       1 file changed, 1 insertion(+), 1 deletion(-)
      0ecaef06
    • Valerie Aurora's avatar
      ext4: fix configuration dependencies for ext4 ACLs and security labels · 96465efe
      Valerie Aurora authored
      Commit "ext4: Remove CONFIG_EXT4_FS_XATTR" removed the configuration
      dependencies for ext4 xattrs from the ext4 ACLs and security labels
      configuration options, but did not replace them with a dependency on
      ext4 itself.  Add back the dependency on ext4 so the options only show
      up if ext4 is enabled.
      Signed-off-by: default avatarValerie Aurora <val@vaaconsulting.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Reviewed-by: default avatarTao Ma <boyu.mt@taobao.com>
      96465efe
    • James Morris's avatar
      Merge branch 'for-Linus' of... · ade24c93
      James Morris authored
      Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      
      Pulled from Mimi's tree.
      ade24c93
  3. 06 Jan, 2013 2 commits
  4. 05 Jan, 2013 25 commits