1. 28 Mar, 2013 7 commits
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · dfca53fb
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael J Wysocki:
      
       - Fix for a recent cpufreq regression related to acpi-cpufreq and
         suspend/resume from Viresh Kumar.
      
       - cpufreq stats reference counting fix from Viresh Kumar.
      
       - intel_pstate driver fixes from Dirk Brandewie and Konrad Rzeszutek
         Wilk.
      
       - New ACPI suspend blacklist entry for Sony Vaio VGN-FW21M from Fabio
         Valentini.
      
       - ACPI Platform Error Interface (APEI) fix from Chen Gong.
      
       - PCI root bridge hotplug locking fix from Yinghai Lu.
      
      * tag 'pm+acpi-3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PCI / ACPI: hold acpi_scan_lock during root bus hotplug
        ACPI / APEI: fix error status check condition for CPER
        ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
        cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()
        cpufreq: stats: do cpufreq_cpu_put() corresponding to cpufreq_cpu_get()
        intel-pstate: Use #defines instead of hard-coded values.
        cpufreq / intel_pstate: Fix calculation of current frequency
        cpufreq / intel_pstate: Add function to check that all MSRs are valid
      dfca53fb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 8b1e54c4
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This removes IPsec ESN support from the talitos/caam drivers since
        they were implemented incorrectly, causing interoperability problems
        if ESN is used with them."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        Revert "crypto: caam - add IPsec ESN support"
        Revert "crypto: talitos - add IPsec ESN support"
      8b1e54c4
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · d3f72cfb
      Linus Torvalds authored
      Pull arm64 fix from Catalin Marinas:
       "Fix IS_ENABLED() usage typo (missing CONFIG_ prefix)."
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        ARM64: early_printk: Fix check for CONFIG_ARM64_64K_PAGES
      d3f72cfb
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-3.9-rc4' of git://gitorious.org/linux-omap-dss2/linux · 5e248509
      Linus Torvalds authored
      Pull fbdev fixes from Tomi Valkeinen:
       "Since Florian is still away/inactive, I volunteered to collect fbdev
        fixes for 3.9 and changes for 3.10.  I didn't receive any other fbdev
        fixes than OMAP yet, but I didn't want to delay this further as
        there's a compilation fix for OMAP1.  So there could be still some
        fbdev fixes on the way a bit later.
      
        This contains:
      
         - Fix OMAP1 compilation
         - OMAP display fixes"
      
      * tag 'fbdev-fixes-3.9-rc4' of git://gitorious.org/linux-omap-dss2/linux:
        omapdss: features: fix supported outputs for OMAP4
        OMAPDSS: tpo-td043 panel: fix data passing between SPI/DSS parts
        omapfb: fix broken build on OMAP1
      5e248509
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 2c3de1c2
      Linus Torvalds authored
      Pull userns fixes from Eric W Biederman:
       "The bulk of the changes are fixing the worst consequences of the user
        namespace design oversight in not considering what happens when one
        namespace starts off as a clone of another namespace, as happens with
        the mount namespace.
      
        The rest of the changes are just plain bug fixes.
      
        Many thanks to Andy Lutomirski for pointing out many of these issues."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Restrict when proc and sysfs can be mounted
        ipc: Restrict mounting the mqueue filesystem
        vfs: Carefully propogate mounts across user namespaces
        vfs: Add a mount flag to lock read only bind mounts
        userns:  Don't allow creation if the user is chrooted
        yama:  Better permission check for ptraceme
        pid: Handle the exit of a multi-threaded init.
        scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.
      2c3de1c2
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-fixes' into fixes · 6125c2be
      Rafael J. Wysocki authored
      * acpi-fixes:
        PCI / ACPI: hold acpi_scan_lock during root bus hotplug
        ACPI / APEI: fix error status check condition for CPER
        ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
      6125c2be
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-fixes' into fixes · 887ede66
      Rafael J. Wysocki authored
      * pm-fixes:
        cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()
        cpufreq: stats: do cpufreq_cpu_put() corresponding to cpufreq_cpu_get()
        intel-pstate: Use #defines instead of hard-coded values.
        cpufreq / intel_pstate: Fix calculation of current frequency
        cpufreq / intel_pstate: Add function to check that all MSRs are valid
      887ede66
  2. 27 Mar, 2013 17 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes · 90641712
      Linus Torvalds authored
      Pull powerpc build fixes from Stephen Rothwell:
       "Just a couple of build fixes for powerpc all{mod,yes}config.
      
        Submitted by me since BenH is on vacation."
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes:
        powerpc: define the conditions where the ePAPR idle hcall can be supported
        powerpc: make additional room in exception vector area
      90641712
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.9-rc4-tag' of... · 33b65f1e
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       "This is mostly just the last stragglers of the regression bugs that
        this merge window had.  There are also two bug-fixes: one that adds an
        extra layer of security, and a regression fix for a change that was
        added in v3.7 (the v1 was faulty, the v2 works).
      
         - Regression fixes for C-and-P states not being parsed properly.
         - Fix possible security issue with guests triggering DoS via
           non-assigned MSI-Xs.
         - Fix regression (introduced in v3.7) with raising an event (v2).
         - Fix hastily introduced band-aid during c0 for the CR3 blowup."
      
      * tag 'stable/for-linus-3.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/events: avoid race with raising an event in unmask_evtchn()
        xen/mmu: Move the setting of pvops.write_cr3 to later phase in bootup.
        xen/acpi-stub: Disable it b/c the acpi_processor_add is no longer called.
        xen-pciback: notify hypervisor about devices intended to be assigned to guests
        xen/acpi-processor: Don't dereference struct acpi_processor on all CPUs.
      33b65f1e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f8966048
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
      
       - fix for potential 3.9 regression in handling of buttons for touchpads
         following HID mt specification; potential because reportedly there is
         no retail product on the market that would be using this feature, but
         nevertheless we'd better follow the spec.  Fix by Benjamin Tissoires.
      
       - support for two quirky devices added by Josh Boyer.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: multitouch: fix touchpad buttons
        HID: usbhid: fix build problem
        HID: usbhid: quirk for MSI GX680R led panel
        HID: usbhid: quirk for Realtek Multi-card reader
      f8966048
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · a8c45289
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Here are some fixes which have collected since Linux v3.9-rc1.
      
        The most important one fixes a long-standing regressen which make
        re-hotplugged devices unusable when AMD IOMMU is used.
      
        The other patches fix build issues (build regression on OMAP and a
        section mismatch).  One patch just removes a duplicate header include."
      
      * tag 'iommu-fixes-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Make sure dma_ops are set for hotplug devices
        x86, io_apic: remove duplicated include from irq_remapping.c
        iommu: OMAP: build only on OMAP2+
        amd_iommu_init: remove __init from amd_iommu_erratum_746_workaround
      a8c45289
    • Al Viro's avatar
      vfs/splice: Fix missed checks in new __kernel_write() helper · 3e84f48e
      Al Viro authored
      Commit 06ae43f3 ("Don't bother with redoing rw_verify_area() from
      default_file_splice_from()") lost the checks to test existence of the
      write/aio_write methods.  My apologies ;-/
      
      Eventually, we want that in fs/splice.c side of things (no point
      repeating it for every buffer, after all), but for now this is the
      obvious minimal fix.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3e84f48e
    • David Vrabel's avatar
      xen/events: avoid race with raising an event in unmask_evtchn() · c26377e6
      David Vrabel authored
      In unmask_evtchn(), when the mask bit is cleared after testing for
      pending and the event becomes pending between the test and clear, then
      the upcall will not become pending and the event may be lost or
      delayed.
      
      Avoid this by always clearing the mask bit before checking for
      pending.  If a hypercall is needed, remask the event as
      EVTCHNOP_unmask will only retrigger pending events if they were
      masked.
      
      This fixes a regression introduced in 3.7 by
      b5e57923 (xen/events: fix
      unmask_evtchn for PV on HVM guests) which reordered the clear mask and
      check pending operations.
      
      Changes in v2:
      - set mask before hypercall.
      
      Cc: stable@vger.kernel.org
      Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      c26377e6
    • Konrad Rzeszutek Wilk's avatar
      xen/mmu: Move the setting of pvops.write_cr3 to later phase in bootup. · d3eb2c89
      Konrad Rzeszutek Wilk authored
      We move the setting of write_cr3 from the early bootup variant
      (see git commit 0cc9129d
      "x86-64, xen, mmu: Provide an early version of write_cr3.")
      to a more appropiate location.
      
      This new location sets all of the other non-early variants
      of pvops calls - and most importantly is before the
      alternative_asm mechanism kicks in.
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      d3eb2c89
    • Konrad Rzeszutek Wilk's avatar
      xen/acpi-stub: Disable it b/c the acpi_processor_add is no longer called. · 76fc2537
      Konrad Rzeszutek Wilk authored
      With the Xen ACPI stub code (CONFIG_XEN_STUB=y) enabled, the power
      C and P states are no longer uploaded to the hypervisor.
      
      The reason is that the Xen CPU hotplug code: xen-acpi-cpuhotplug.c
      and the xen-acpi-stub.c register themselves as the "processor" type object.
      
      That means the generic processor (processor_driver.c) stops
      working and it does not call (acpi_processor_add) which populates the
      
               per_cpu(processors, pr->id) = pr;
      
      structure. The 'pr' is gathered from the acpi_processor_get_info function
      which does the job of finding the C-states and figuring out PBLK address.
      
      The 'processors->pr' is then later used by xen-acpi-processor.c (the one that
      uploads C and P states to the hypervisor). Since it is NULL, we end
      skip the gathering of _PSD, _PSS, _PCT, etc and never upload the power
      management data.
      
      The end result is that enabling the CONFIG_XEN_STUB in the build means that
      xen-acpi-processor is not working anymore.
      
      This temporary patch fixes it by marking the XEN_STUB driver as
      BROKEN until this can be properly fixed.
      
      CC: jinsong.liu@intel.com
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      76fc2537
    • Eric W. Biederman's avatar
      userns: Restrict when proc and sysfs can be mounted · 87a8ebd6
      Eric W. Biederman authored
      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: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      87a8ebd6
    • Eric W. Biederman's avatar
      ipc: Restrict mounting the mqueue filesystem · a636b702
      Eric W. Biederman authored
      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: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      a636b702
    • Eric W. Biederman's avatar
      vfs: Carefully propogate mounts across user namespaces · 132c94e3
      Eric W. Biederman authored
      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: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Reported-by: default avatarAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      132c94e3
    • Eric W. Biederman's avatar
      vfs: Add a mount flag to lock read only bind mounts · 90563b19
      Eric W. Biederman authored
      When a read-only bind mount is copied from mount namespace in a higher
      privileged user namespace to a mount namespace in a lesser privileged
      user namespace, it should not be possible to remove the the read-only
      restriction.
      
      Add a MNT_LOCK_READONLY mount flag to indicate that a mount must
      remain read-only.
      
      CC: stable@vger.kernel.org
      Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      90563b19
    • Eric W. Biederman's avatar
      userns: Don't allow creation if the user is chrooted · 3151527e
      Eric W. Biederman authored
      Guarantee that the policy of which files may be access that is
      established by setting the root directory will not be violated
      by user namespaces by verifying that the root directory points
      to the root of the mount namespace at the time of user namespace
      creation.
      
      Changing the root is a privileged operation, and as a matter of policy
      it serves to limit unprivileged processes to files below the current
      root directory.
      
      For reasons of simplicity and comprehensibility the privilege to
      change the root directory is gated solely on the CAP_SYS_CHROOT
      capability in the user namespace.  Therefore when creating a user
      namespace we must ensure that the policy of which files may be access
      can not be violated by changing the root directory.
      
      Anyone who runs a processes in a chroot and would like to use user
      namespace can setup the same view of filesystems with a mount
      namespace instead.  With this result that this is not a practical
      limitation for using user namespaces.
      
      Cc: stable@vger.kernel.org
      Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Reported-by: default avatarAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      3151527e
    • Benjamin Tissoires's avatar
      HID: multitouch: fix touchpad buttons · 4c437555
      Benjamin Tissoires authored
      Commit "HID: multitouch: use the callback "report" instead..." breaks the
      buttons of touchpads following the HID multitouch specification.
      The buttons were emmitted through hid-input, but as now the events
      are generated only in hid-multitouch, the buttons are not emmitted anymore.
      
      The input_event() call is far much simpler than the hid-input one as
      many of the different tests do not apply to multitouch touchpads.
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      4c437555
    • Joerg Roedel's avatar
      iommu/amd: Make sure dma_ops are set for hotplug devices · c2a2876e
      Joerg Roedel authored
      There is a bug introduced with commit 27c2127a that causes
      devices which are hot unplugged and then hot-replugged to
      not have per-device dma_ops set. This causes these devices
      to not function correctly. Fixed with this patch.
      
      Cc: stable@vger.kernel.org
      Reported-by: default avatarAndreas Degert <andreas.degert@googlemail.com>
      Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
      c2a2876e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · de55eb1d
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "stable fodder; assorted deadlock fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vt: synchronize_rcu() under spinlock is not nice...
        Nest rename_lock inside vfsmount_lock
        Don't bother with redoing rw_verify_area() from default_file_splice_from()
      de55eb1d
    • Al Viro's avatar
      vt: synchronize_rcu() under spinlock is not nice... · e8cd8169
      Al Viro authored
      vcs_poll_data_free() calls unregister_vt_notifier(), which calls
      atomic_notifier_chain_unregister(), which calls synchronize_rcu().
      Do it *after* we'd dropped ->f_lock.
      
      Cc: stable@vger.kernel.org (all kernels since 2.6.37)
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      e8cd8169
  3. 26 Mar, 2013 16 commits