1. 30 3月, 2013 5 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · b92eded4
      Linus Torvalds 提交于
      Pull ceph fix from Sage Weil:
       "This fixes a regression introduced during the last merge window when
        mapping non-existent images."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: don't zero-fill non-image object requests
      b92eded4
    • A
      rbd: don't zero-fill non-image object requests · 6e2a4505
      Alex Elder 提交于
      A result of ENOENT from a read request for an object that's part of
      an rbd image indicates that there is a hole in that portion of the
      image.  Similarly, a short read for such an object indicates that
      the remainder of the read should be interpreted a full read with
      zeros filling out the end of the request.
      
      This behavior is not correct for objects that are not backing rbd
      image data.  Currently rbd_img_obj_request_callback() assumes it
      should be done for all objects.
      
      Change rbd_img_obj_request_callback() so it only does this zeroing
      for image objects.  Encapsulate that special handling in its own
      function.  Add an assertion that the image object request is a bio
      request, since we assume that (and we currently don't support any
      other types).
      
      This resolves a problem identified here:
          http://tracker.ceph.com/issues/4559
      
      The regression was introduced by bf0d5f50.
      Reported-by: NDan van der Ster <dan@vanderster.com>
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-off-by: NSage Weil <sage@inktank.com>
      6e2a4505
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 3615db41
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "We've had a busy two weeks of bug fixing.  The biggest patches in here
        are some long standing early-enospc problems (Josef) and a very old
        race where compression and mmap combine forces to lose writes (me).
        I'm fairly sure the mmap bug goes all the way back to the introduction
        of the compression code, which is proof that fsx doesn't trigger every
        possible mmap corner after all.
      
        I'm sure you'll notice one of these is from this morning, it's a small
        and isolated use-after-free fix in our scrub error reporting.  I
        double checked it here."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: don't drop path when printing out tree errors in scrub
        Btrfs: fix wrong return value of btrfs_lookup_csum()
        Btrfs: fix wrong reservation of csums
        Btrfs: fix double free in the btrfs_qgroup_account_ref()
        Btrfs: limit the global reserve to 512mb
        Btrfs: hold the ordered operations mutex when waiting on ordered extents
        Btrfs: fix space accounting for unlink and rename
        Btrfs: fix space leak when we fail to reserve metadata space
        Btrfs: fix EIO from btrfs send in is_extent_unchanged for punched holes
        Btrfs: fix race between mmap writes and compression
        Btrfs: fix memory leak in btrfs_create_tree()
        Btrfs: fix locking on ROOT_REPLACE operations in tree mod log
        Btrfs: fix missing qgroup reservation before fallocating
        Btrfs: handle a bogus chunk tree nicely
        Btrfs: update to use fs_state bit
      3615db41
    • L
      ia64 idle: delete stale (*idle)() function pointer · ed176886
      Len Brown 提交于
      Commit 3e7fc708 ("ia64 idle: delete pm_idle") in 3.9-rc1 didn't
      finish the job, leaving an un-initialized reference to (*idle)().
      
      [ Haven't seen a crash from this - but seems like we are just being
        lucky that "idle" is zero so it does get initialized before we jump to
        randomland  - Len ]
      Reported-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ed176886
    • L
      Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 67e17c11
      Linus Torvalds 提交于
      Pull arc architecture fixes from Vineet Gupta:
       "This includes fix for a serious bug in DMA mapping API, make
        allyesconfig wreckage, removal of bogus email-list placeholder in
        MAINTAINERS, a typo in ptrace helper code and last remaining changes
        for syscall ABI v3 which we are finally starting to transition-to
        internally.
      
        The request is late than I intended to - but I was held up with
        debugging a timer link list corruption, for which a proposed fix to
        generic timer code was sent out to lkml/tglx earlier today."
      
      * 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: Fix the typo in event identifier flags used by ptrace
        arc: fix dma_address assignment during dma_map_sg()
        ARC: Remove SET_PERSONALITY (tracks cross-arch change)
        ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
        ARC: ABIv3: Print the correct ABI ver
        ARC: make allyesconfig build breakages
        ARC: MAINTAINERS update for ARC
      67e17c11
  2. 29 3月, 2013 12 次提交
  3. 28 3月, 2013 19 次提交
  4. 27 3月, 2013 4 次提交
    • R
      usb: Fix compile error by selecting USB_OTG_UTILS · c8fa48d3
      Roland Stigge 提交于
      The current lpc32xx_defconfig breaks like this, caused by recent phy
      restructuring:
      
        LD      init/built-in.o
      drivers/built-in.o: In function `usb_hcd_nxp_probe':
      drivers/usb/host/ohci-nxp.c:224: undefined reference to `isp1301_get_client'
      drivers/built-in.o: In function `lpc32xx_udc_probe':
      drivers/usb/gadget/lpc32xx_udc.c:3104: undefined reference to
      `isp1301_get_client' distcc[27867] ERROR: compile (null) on localhost failed
      make: *** [vmlinux] Error 1
      
      Caused by 1c208881 (usb: Makefile: fix
      drivers/usb/phy/ Makefile entry)
      
      This patch fixes this by selecting USB_OTG_UTILS in Kconfig which
      causes the phy driver to be built again.
      Signed-off-by: NRoland Stigge <stigge@antcom.de>
      Acked-by: NFelipe Balbi <balbi@ti.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c8fa48d3
    • E
      userns: Restrict when proc and sysfs can be mounted · 87a8ebd6
      Eric W. Biederman 提交于
      Only allow unprivileged mounts of proc and sysfs if they are already
      mounted when the user namespace is created.
      
      proc and sysfs are interesting because they have content that is
      per namespace, and so fresh mounts are needed when new namespaces
      are created while at the same time proc and sysfs have content that
      is shared between every instance.
      
      Respect the policy of who may see the shared content of proc and sysfs
      by only allowing new mounts if there was an existing mount at the time
      the user namespace was created.
      
      In practice there are only two interesting cases: proc and sysfs are
      mounted at their usual places, proc and sysfs are not mounted at all
      (some form of mount namespace jail).
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      87a8ebd6
    • E
      ipc: Restrict mounting the mqueue filesystem · a636b702
      Eric W. Biederman 提交于
      Only allow mounting the mqueue filesystem if the caller has CAP_SYS_ADMIN
      rights over the ipc namespace.   The principle here is if you create
      or have capabilities over it you can mount it, otherwise you get to live
      with what other people have mounted.
      
      This information is not particularly sensitive and mqueue essentially
      only reports which posix messages queues exist.  Still when creating a
      restricted environment for an application to live any extra
      information may be of use to someone with sufficient creativity.  The
      historical if imperfect way this information has been restricted has
      been not to allow mounts and restricting this to ipc namespace
      creators maintains the spirit of the historical restriction.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      a636b702
    • E
      vfs: Carefully propogate mounts across user namespaces · 132c94e3
      Eric W. Biederman 提交于
      As a matter of policy MNT_READONLY should not be changable if the
      original mounter had more privileges than creator of the mount
      namespace.
      
      Add the flag CL_UNPRIVILEGED to note when we are copying a mount from
      a mount namespace that requires more privileges to a mount namespace
      that requires fewer privileges.
      
      When the CL_UNPRIVILEGED flag is set cause clone_mnt to set MNT_NO_REMOUNT
      if any of the mnt flags that should never be changed are set.
      
      This protects both mount propagation and the initial creation of a less
      privileged mount namespace.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
      Reported-by: NAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      132c94e3