1. 05 8月, 2014 2 次提交
    • E
      proc: Have net show up under /proc/<tgid>/task/<tid> · 6ba8ed79
      Eric W. Biederman 提交于
      Network namespaces are per task so it make sense for them to show up
      in the task directory.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      6ba8ed79
    • E
      NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes · 65b38851
      Eric W. Biederman 提交于
      The usage of pid_ns->child_reaper->nsproxy->net_ns in
      nfs_server_list_open and nfs_client_list_open is not safe.
      
      /proc for a pid namespace can remain mounted after the all of the
      process in that pid namespace have exited.  There are also times
      before the initial process in a pid namespace has started or after the
      initial process in a pid namespace has exited where
      pid_ns->child_reaper can be NULL or stale.  Making the idiom
      pid_ns->child_reaper->nsproxy a double whammy of problems.
      
      Luckily all that needs to happen is to move /proc/fs/nfsfs/servers and
      /proc/fs/nfsfs/volumes under /proc/net to /proc/net/nfsfs/servers and
      /proc/net/nfsfs/volumes and add a symlink from the original location,
      and to use seq_open_net as it has been designed.
      
      Cc: stable@vger.kernel.org
      Cc: Trond Myklebust <trond.myklebust@primarydata.com>
      Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      65b38851
  2. 01 8月, 2014 5 次提交
    • E
      mnt: Add tests for unprivileged remount cases that have found to be faulty · db181ce0
      Eric W. Biederman 提交于
      Kenton Varda <kenton@sandstorm.io> discovered that by remounting a
      read-only bind mount read-only in a user namespace the
      MNT_LOCK_READONLY bit would be cleared, allowing an unprivileged user
      to the remount a read-only mount read-write.
      
      Upon review of the code in remount it was discovered that the code allowed
      nosuid, noexec, and nodev to be cleared.  It was also discovered that
      the code was allowing the per mount atime flags to be changed.
      
      The first naive patch to fix these issues contained the flaw that using
      default atime settings when remounting a filesystem could be disallowed.
      
      To avoid this problems in the future add tests to ensure unprivileged
      remounts are succeeding and failing at the appropriate times.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      db181ce0
    • E
      mnt: Change the default remount atime from relatime to the existing value · ffbc6f0e
      Eric W. Biederman 提交于
      Since March 2009 the kernel has treated the state that if no
      MS_..ATIME flags are passed then the kernel defaults to relatime.
      
      Defaulting to relatime instead of the existing atime state during a
      remount is silly, and causes problems in practice for people who don't
      specify any MS_...ATIME flags and to get the default filesystem atime
      setting.  Those users may encounter a permission error because the
      default atime setting does not work.
      
      A default that does not work and causes permission problems is
      ridiculous, so preserve the existing value to have a default
      atime setting that is always guaranteed to work.
      
      Using the default atime setting in this way is particularly
      interesting for applications built to run in restricted userspace
      environments without /proc mounted, as the existing atime mount
      options of a filesystem can not be read from /proc/mounts.
      
      In practice this fixes user space that uses the default atime
      setting on remount that are broken by the permission checks
      keeping less privileged users from changing more privileged users
      atime settings.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      ffbc6f0e
    • E
      mnt: Correct permission checks in do_remount · 9566d674
      Eric W. Biederman 提交于
      While invesgiating the issue where in "mount --bind -oremount,ro ..."
      would result in later "mount --bind -oremount,rw" succeeding even if
      the mount started off locked I realized that there are several
      additional mount flags that should be locked and are not.
      
      In particular MNT_NOSUID, MNT_NODEV, MNT_NOEXEC, and the atime
      flags in addition to MNT_READONLY should all be locked.  These
      flags are all per superblock, can all be changed with MS_BIND,
      and should not be changable if set by a more privileged user.
      
      The following additions to the current logic are added in this patch.
      - nosuid may not be clearable by a less privileged user.
      - nodev  may not be clearable by a less privielged user.
      - noexec may not be clearable by a less privileged user.
      - atime flags may not be changeable by a less privileged user.
      
      The logic with atime is that always setting atime on access is a
      global policy and backup software and auditing software could break if
      atime bits are not updated (when they are configured to be updated),
      and serious performance degradation could result (DOS attack) if atime
      updates happen when they have been explicitly disabled.  Therefore an
      unprivileged user should not be able to mess with the atime bits set
      by a more privileged user.
      
      The additional restrictions are implemented with the addition of
      MNT_LOCK_NOSUID, MNT_LOCK_NODEV, MNT_LOCK_NOEXEC, and MNT_LOCK_ATIME
      mnt flags.
      
      Taken together these changes and the fixes for MNT_LOCK_READONLY
      should make it safe for an unprivileged user to create a user
      namespace and to call "mount --bind -o remount,... ..." without
      the danger of mount flags being changed maliciously.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      9566d674
    • E
      mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount · 07b64558
      Eric W. Biederman 提交于
      There are no races as locked mount flags are guaranteed to never change.
      
      Moving the test into do_remount makes it more visible, and ensures all
      filesystem remounts pass the MNT_LOCK_READONLY permission check.  This
      second case is not an issue today as filesystem remounts are guarded
      by capable(CAP_DAC_ADMIN) and thus will always fail in less privileged
      mount namespaces, but it could become an issue in the future.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      07b64558
    • E
      mnt: Only change user settable mount flags in remount · a6138db8
      Eric W. Biederman 提交于
      Kenton Varda <kenton@sandstorm.io> discovered that by remounting a
      read-only bind mount read-only in a user namespace the
      MNT_LOCK_READONLY bit would be cleared, allowing an unprivileged user
      to the remount a read-only mount read-write.
      
      Correct this by replacing the mask of mount flags to preserve
      with a mask of mount flags that may be changed, and preserve
      all others.   This ensures that any future bugs with this mask and
      remount will fail in an easy to detect way where new mount flags
      simply won't change.
      
      Cc: stable@vger.kernel.org
      Acked-by: NSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      a6138db8
  3. 30 7月, 2014 1 次提交
    • E
      namespaces: Use task_lock and not rcu to protect nsproxy · 728dba3a
      Eric W. Biederman 提交于
      The synchronous syncrhonize_rcu in switch_task_namespaces makes setns
      a sufficiently expensive system call that people have complained.
      
      Upon inspect nsproxy no longer needs rcu protection for remote reads.
      remote reads are rare.  So optimize for same process reads and write
      by switching using rask_lock instead.
      
      This yields a simpler to understand lock, and a faster setns system call.
      
      In particular this fixes a performance regression observed
      by Rafael David Tinoco <rafael.tinoco@canonical.com>.
      
      This is effectively a revert of Pavel Emelyanov's commit
      cf7b708c Make access to task's nsproxy lighter
      from 2007.  The race this originialy fixed no longer exists as
      do_notify_parent uses task_active_pid_ns(parent) instead of
      parent->nsproxy.
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      728dba3a
  4. 21 7月, 2014 9 次提交
  5. 20 7月, 2014 11 次提交
  6. 19 7月, 2014 12 次提交
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d614cb0b
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A smaller set of fixes this week, and all regression fixes:
         - a handful of issues fixed on at91 with common clock conversion
         - a set of fixes for Marvell mvebu (SMP, coherency, PM)
         - a clock fix for i.MX6Q.
         - ... and a SMP/hotplug fix for Exynos"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: EXYNOS: Fix core ID used by platsmp and hotplug code
        ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
        ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
        ARM: at91: at91sam9x5: correct typo error for ohci clock
        ARM: clk-imx6q: parent lvds_sel input from upstream clock gates
        ARM: mvebu: Fix coherency bus notifiers by using separate notifiers
        ARM: mvebu: Fix the operand list in the inline asm of armada_370_xp_pmsu_idle_enter
        ARM: mvebu: fix SMP boot for Armada 38x and Armada 375 Z1 in big endian
      d614cb0b
    • D
      Merge tag 'drm-intel-fixes-2014-07-18' of git://anongit.freedesktop.org/drm-intel · e898c791
      Dave Airlie 提交于
      But in any case nothing really shocking in
      here, 2 reverts, 1 quirk and a regression fix a WARN.
      
      * tag 'drm-intel-fixes-2014-07-18' of git://anongit.freedesktop.org/drm-intel:
        Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
        drm/i915: Track the primary plane correctly when reassigning planes
        drm/i915: Ignore VBT backlight presence check on HP Chromebook 14
        Revert "drm/i915: Don't set the 8to6 dither flag when not scaling"
      e898c791
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b9f0efd
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "A couple of key fixes and a few less critical ones.  The main ones
        are:
      
         - add a .bss section to the PE/COFF headers when building with EFI
           stub
      
         - invoke the correct paravirt magic when building the espfix page
           tables
      
        Unfortunately both of these areas also have at least one additional
        fix each still in thie pipeline, but which are not yet ready to push"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Remove unused variable "polling"
        x86/espfix/xen: Fix allocation of pages for paravirt page tables
        x86/efi: Include a .bss section within the PE/COFF headers
        efi: fdt: Do not report an error during boot if UEFI is not available
        efi/arm64: efistub: remove local copy of linux_banner
      1b9f0efd
    • L
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · b579fcca
      Linus Torvalds 提交于
      Pull infiniband/rdma fixes from Roland Dreier:
       - cxgb4 hardware driver regression fixes
       - mlx5 hardware driver regression fixes
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mlx5: Enable "block multicast loopback" for kernel consumers
        RDMA/cxgb4: Call iwpm_init() only once
        mlx5_core: Fix possible race between mr tree insert/delete
        RDMA/cxgb4: Initialize the device status page
        RDMA/cxgb4: Clean up connection on ARP error
        RDMA/cxgb4: Fix skb_leak in reject_cr()
      b579fcca
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · cfd1b99b
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck:
       "More fallout from module tests and code inspection.
      
        Fixes to temperature limit write operations in adt7470 driver.  Also,
        dashes are not allowed in hwmon 'name' attributes.  Fix drivers where
        necessary"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (adt7470) Fix writes to temperature limit registers
        hwmon: (da9055) Don't use dash in the name attribute
        hwmon: (da9052) Don't use dash in the name attribute
      cfd1b99b
    • L
      Merge tag 'iommu-fixes-v3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 0bae49b2
      Linus Torvalds 提交于
      Pull iommu fixes from Joerg Roedel:
       "A couple of fixes for the Freescale PAMU driver queued up:
      
         - fix PAMU window size check.
         - fix the device domain attach condition.
         - fix the error condition during iommu group"
      
      * tag 'iommu-fixes-v3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/fsl: Fix the error condition during iommu group
        iommu/fsl: Fix the device domain attach condition.
        iommu/fsl: Fix PAMU window size check.
      0bae49b2
    • L
      Merge tag 'pm+acpi-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 084c9cac
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are a few recent regression fixes, a revert of the ACPI video
        commit I promised, a system resume fix related to request_firmware(),
        an ACPI video quirk for one more Win8-oriented BIOS, an ACPI device
        enumeration documentation update and a few fixes for ARM cpufreq
        drivers.
      
        Specifics:
      
         - Fix for a recently introduced NULL pointer dereference in the core
           system suspend code occuring when platforms without ACPI attempt to
           use the "freeze" sleep state from Zhang Rui.
      
         - Fix for a recently introduced build warning in cpufreq headers from
           Brian W Hart.
      
         - Fix for a 3.13 cpufreq regression related to sysem resume that
           triggers on some systems with multiple CPU clusters from Viresh
           Kumar.
      
         - Fix for a 3.4 regression in request_firmware() resulting in
           WARN_ON()s on some systems during system resume from Takashi Iwai.
      
         - Revert of the ACPI video commit that changed the default value of
           the video.brightness_switch_enabled command line argument to 0 as
           it has been reported to break existing setups.
      
         - ACPI device enumeration documentation update to take recent code
           changes into account and make the documentation match the code
           again from Darren Hart.
      
         - Fixes for the sa1110, imx6q, kirkwood, and cpu0 cpufreq drivers
           from Linus Walleij, Nicolas Del Piano, Quentin Armitage, Viresh
           Kumar.
      
         - New ACPI video blacklist entry for HP ProBook 4540s from Hans de
           Goede"
      
      * tag 'pm+acpi-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: make table sentinel macros unsigned to match use
        cpufreq: move policy kobj to policy->cpu at resume
        cpufreq: cpu0: OPPs can be populated at runtime
        cpufreq: kirkwood: Reinstate cpufreq driver for ARCH_KIRKWOOD
        cpufreq: imx6q: Select PM_OPP
        cpufreq: sa1110: set memory type for h3600
        ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s
        PM / sleep: fix freeze_ops NULL pointer dereferences
        PM / sleep: Fix request_firmware() error at resume
        Revert "ACPI / video: change acpi-video brightness_switch_enabled default to 0"
        ACPI / documentation: Remove reference to acpi_platform_device_ids from enumeration.txt
      084c9cac
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 3e8e2756
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "One nouveau deadlock fix, one qxl irq handling fix, and a set of
        radeon pageflipping changes that fix regressions in pageflipping since
        -rc1 along with a leak and backlight fix.
      
        The pageflipping fixes are a bit bigger than I'd like, but there has
        been a few people focused on testing them"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: Make classic pageflip completion path less racy.
        drm/radeon: Add missing vblank_put in pageflip ioctl error path.
        drm/radeon: Remove redundant fence unref in pageflip path.
        drm/radeon: Complete page flip even if waiting on the BO fence fails
        drm/radeon: Move pinning the BO back to radeon_crtc_page_flip()
        drm/radeon: Prevent too early kms-pageflips triggered by vblank.
        drm/radeon: set default bl level to something reasonable
        drm/radeon: avoid leaking edid data
        drm/qxl: return IRQ_NONE if it was not our irq
        drm/nouveau/therm: fix a potential deadlock in the therm monitoring code
      3e8e2756
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · b8d2d128
      Linus Torvalds 提交于
      Pull /dev/random fix from Ted Ts'o:
       "Fix a BUG splat found by trinity"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: check for increase of entropy_count because of signed conversion
      b8d2d128
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 4e106275
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This push fixes a boot hang in virt guests when the virtio RNG is
        enabled"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        hwrng: virtio - ensure reads happen after successful probe
        hwrng: fetch randomness only after device init
      4e106275
    • H
      random: check for increase of entropy_count because of signed conversion · 79a84687
      Hannes Frederic Sowa 提交于
      The expression entropy_count -= ibytes << (ENTROPY_SHIFT + 3) could
      actually increase entropy_count if during assignment of the unsigned
      expression on the RHS (mind the -=) we reduce the value modulo
      2^width(int) and assign it to entropy_count. Trinity found this.
      
      [ Commit modified by tytso to add an additional safety check for a
        negative entropy_count -- which should never happen, and to also add
        an additional paranoia check to prevent overly large count values to
        be passed into urandom_read().  ]
      Reported-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      79a84687
    • T
      ARM: EXYNOS: Fix core ID used by platsmp and hotplug code · 9637f30e
      Tomasz Figa 提交于
      When CPU topology is specified in device tree, cpu_logical_map() does
      not return core ID anymore, but rather full MPIDR value. This breaks
      existing calculation of PMU register offsets on Exynos SoCs.
      
      This patch fixes the problem by adjusting the code to use only core ID
      bits of the value returned by cpu_logical_map() to allow CPU topology to
      be specified in device tree on Exynos SoCs.
      Signed-off-by: NTomasz Figa <t.figa@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      9637f30e