29 Mar, 2013

11 commits

  • This reverts commit 186930500985 ("mm: introduce VM_POPULATE flag to
    better deal with racy userspace programs").

    VM_POPULATE only has any effect when userspace plays racy games with
    vmas by trying to unmap and remap memory regions that mmap or mlock are
    operating on.

    Also, the only effect of VM_POPULATE when userspace plays such games is
    that it avoids populating new memory regions that get remapped into the
    address range that was being operated on by the original mmap or mlock
    calls.

    Let's remove VM_POPULATE as there isn't any strong argument to mandate a
    new vm_flag.

    Signed-off-by: Michel Lespinasse
    Signed-off-by: Hugh Dickins
    Signed-off-by: Linus Torvalds

    Michel Lespinasse
     
  • Pull USB fixes from Greg Kroah-Hartman:
    "Here are some USB fixes to resolve issues reported recently, as well
    as a new device id for the ftdi_sio driver."

    * tag 'usb-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
    usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
    usb: Fix compile error by selecting USB_OTG_UTILS
    USB: serial: fix hang when opening port
    USB: EHCI: fix bug in iTD/siTD DMA pool allocation
    xhci: Don't warn on empty ring for suspended devices.
    usb: xhci: Fix TRB transfer length macro used for Event TRB.
    usb/acpi: binding xhci root hub usb port with ACPI
    usb: add find_raw_port_number callback to struct hc_driver()
    usb: xhci: fix build warning

    Linus Torvalds
     
  • Pull TTY/serial fixes from Greg Kroah-Hartman:
    "Here are some tty/serial driver fixes for 3.9.

    The big thing here is the fix for the huge mess we caused renaming the
    8250 driver accidentally in the 3.7 kernel release, without realizing
    that there were users of the module options that suddenly broke. This
    is now resolved, and, to top the injury off, we have a backwards-
    compatible option for those users who got used to the new name since
    3.7. Ugh, sorry about that.

    Other than that, some other minor fixes for issues that have been
    reported by users."

    * tag 'tty-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    Xilinx: ARM: UART: clear pending irqs before enabling irqs
    TTY: 8250, deprecated 8250_core.* options
    TTY: 8250, revert module name change
    serial: 8250_pci: Add WCH CH352 quirk to avoid Xscale detection
    tty: atmel_serial_probe(): index of atmel_ports[] fix

    Linus Torvalds
     
  • Pull staging driver fixes from Greg Kroah-Hartman:
    "Here are two tiny staging driver fixes to resolve issues that have
    been reported."

    * tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    staging: comedi: s626: fix continuous acquisition
    staging: zcache: fix typo "64_BIT"

    Linus Torvalds
     
  • Pull sysfs fixes from Greg Kroah-Hartman:
    "Here are two fixes for sysfs that resolve issues that have been found
    by the Trinity fuzz tool, causing oopses in sysfs. They both have
    been in linux-next for a while to ensure that they do not cause any
    other problems."

    * tag 'driver-core-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    sysfs: handle failure path correctly for readdir()
    sysfs: fix race between readdir and lseek

    Linus Torvalds
     
  • Pull char/misc driver fixes from Greg Kroah-Hartman:
    "Here are some small char/misc driver fixes that resolve issues
    recently reported against the 3.9-rc kernels. All have been in
    linux-next for a while."

    * tag 'char-misc-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    VMCI: Fix process-to-process DRGAMs.
    mei: ME hardware reset needs to be synchronized
    mei: add mei_stop function to stop mei device
    extcon: max77693: Initialize register of MUIC device to bring up it without platform data
    extcon: max77693: Fix bug of wrong pointer when platform data is not used
    extcon: max8997: Check the pointer of platform data to protect null pointer error

    Linus Torvalds
     
  • 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

    Linus Torvalds
     
  • 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"

    Linus Torvalds
     
  • 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

    Linus Torvalds
     
  • 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

    Linus Torvalds
     
  • 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.

    Linus Torvalds
     

28 Mar, 2013

11 commits

  • It enhances the driver for FTDI-based USB serial adapters
    to recognize Mitsubishi Electric Corp. USB/RS422 Converters
    as FT232BM chips and support them.
    https://search.meau.com/?q=FX-USB-AW

    Signed-off-by: Konstantin Holoborodko
    Tested-by: Konstantin Holoborodko
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Konstantin Holoborodko
     
  • * 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

    Rafael J. Wysocki
     
  • * 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

    Rafael J. Wysocki
     
  • 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

    Linus Torvalds
     
  • 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.

    Linus Torvalds
     
  • 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

    Linus Torvalds
     
  • 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

    Linus Torvalds
     
  • Commit 06ae43f34bcc ("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: Dave Jones
    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • 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
    b5e579232d635b79a3da052964cb357ccda8d9ea (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: Stefano Stabellini
    Signed-off-by: David Vrabel
    Signed-off-by: Konrad Rzeszutek Wilk

    David Vrabel
     
  • We move the setting of write_cr3 from the early bootup variant
    (see git commit 0cc9129d75ef8993702d97ab0e49542c15ac6ab9
    "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: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 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: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     

27 Mar, 2013

18 commits

  • 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 1c2088812f095df77f4b3224b65db79d7111a300 (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: Roland Stigge
    Acked-by: Felipe Balbi
    Signed-off-by: Greg Kroah-Hartman

    Roland Stigge
     
  • 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: Serge Hallyn
    Signed-off-by: "Eric W. Biederman"

    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: Serge Hallyn
    Signed-off-by: "Eric W. Biederman"

    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: Serge Hallyn
    Reported-by: Andy Lutomirski
    Signed-off-by: "Eric W. Biederman"

    Eric W. Biederman
     
  • 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: Serge Hallyn
    Signed-off-by: "Eric W. Biederman"

    Eric W. Biederman
     
  • 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: Serge Hallyn
    Reported-by: Andy Lutomirski
    Signed-off-by: "Eric W. Biederman"

    Eric W. Biederman
     
  • 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: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     
  • There is a bug introduced with commit 27c2127 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: Andreas Degert
    Signed-off-by: Joerg Roedel

    Joerg Roedel
     
  • 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()

    Linus Torvalds
     
  • 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: Al Viro

    Al Viro
     
  • During merging the PCI tree with the PM/ACPI tree, Linus noticed
    that we don't use the same lock using patten about ACPI PCI root as
    acpiphp.

    Here apply the same locking patten, and we need to execute
    acpi_bus_hot_remove_device() via acpi_os_hotplug_execute()
    as it also holds acpi_scan_lock.

    [rjw: Changelog]
    Reported-by: Linus Torvalds
    Signed-off-by: Yinghai Lu
    No-objection-from: Bjorn Helgaas
    Signed-off-by: Rafael J. Wysocki

    Yinghai Lu
     
  • In Table 18-289, ACPI5.0 SPEC, the error data length in CPER
    Generic Error Data Entry can be 0, which means this generic
    error data entry can have only one header. So fix the check
    conditon for it.

    Signed-off-by: Chen Gong
    Reviewed-by: Huang Ying
    Signed-off-by: Rafael J. Wysocki

    Chen Gong
     
  • Add Sony Vaio VGN-FW21M to the device blacklist in
    drivers/acpi/sleep.c.

    Fixes suspend/resume on this device (device no longer reboots
    instead of resuming).

    References: https://bugzilla.kernel.org/show_bug.cgi?id=55001
    Signed-off-by: Fabio Valentini
    Signed-off-by: Rafael J. Wysocki

    Fabio Valentini
     
  • ... lest we get livelocks between path_is_under() and d_path() and friends.

    The thing is, wrt fairness lglocks are more similar to rwsems than to rwlocks;
    it is possible to have thread B spin on attempt to take lock shared while thread
    A is already holding it shared, if B is on lower-numbered CPU than A and there's
    a thread C spinning on attempt to take the same lock exclusive.

    As the result, we need consistent ordering between vfsmount_lock (lglock) and
    rename_lock (seq_lock), even though everything that takes both is going to take
    vfsmount_lock only shared.

    Spotted-by: Brad Spengler
    Cc: stable@vger.kernel.org
    Signed-off-by: Al Viro

    Al Viro
     
  • Pull networking fixes from David Miller:

    1) Always increment IPV4 ID field in encapsulated GSO packets, even
    when DF is set. Regression fix from Pravin B Shelar.

    2) Fix per-net subsystem initialization in netfilter conntrack,
    otherwise we may access dynamically allocated memory before it is
    actually allocated. From Gao Feng.

    3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.

    4) Fix race between submission of sync vs async commands in mwifiex
    driver, from Amitkumar Karwar.

    5) Add missing cancel of command timer in mwifiex driver, from Bing
    Zhao.

    6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.

    7) Thermal layer tries to use a genetlink multicast string that is
    longer than the 16 character limit. Fix it and add a BUG check to
    prevent this kind of thing from happening in the future.

    From Masatake YAMATO.

    8) Fix many bugs in the handling of the teardown of L2TP connections,
    UDP encapsulation instances, and sockets. From Tom Parkin.

    9) Missing socket release in IRDA, from Kees Cook.

    10) Fix fec driver modular build, from Fabio Estevam.

    11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,
    from Wei Yongjun.

    12) Fix bugs in handling of queue numbers and steering rules in mlx4
    driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.

    13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey
    Vagin.

    14) TCP segmentation deferral is unintentionally done too strongly,
    breaking ACK clocking. Fix from Eric Dumazet.

    15) net_enable_timestamp() can legitimately be invoked from software
    interrupts, and in a way that is safe, so remove the WARN_ON().
    Also from Eric Dumazet.

    16) Fix use after free in VLANs, from Cong Wang.

    17) Fix TCP slow start retransmit storms after SACK reneging, from
    Yuchung Cheng.

    18) Unix socket release should mark a socket dead before NULL'ing out
    sock->sk, otherwise we can race. Fix from Paul Moore.

    19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.

    20) Fix register mis-programming, NULL pointer derefs, and wrong PHC
    clock frequency in IGB driver. From Lior LevyAlex Williamson, Jiri
    Benc, and Jeff Kirsher.

    21) skb->ip_summed logic in pch_gbe driver is reversed, breaking packet
    forwarding. Fix from Veaceslav Falico.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
    ipv4: Fix ip-header identification for gso packets.
    bonding: remove already created master sysfs link on failure
    af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
    pch_gbe: fix ip_summed checksum reporting on rx
    igb: fix PHC stopping on max freq
    igb: make sensor info static
    igb: SR-IOV init reordering
    igb: Fix null pointer dereference
    igb: fix i350 anti spoofing config
    ixgbevf: don't release the soft entries
    ipv6: fix bad free of addrconf_init_net
    unix: fix a race condition in unix_release()
    tcp: undo spurious timeout after SACK reneging
    bnx2x: fix assignment of signed expression to unsigned variable
    bridge: fix crash when set mac address of br interface
    8021q: fix a potential use-after-free
    net: remove a WARN_ON() in net_enable_timestamp()
    tcp: preserve ACK clocking in TSO
    net: fix *_DIAG_MAX constants
    net/mlx4_core: Disallow releasing VF QPs which have steering rules
    ...

    Linus Torvalds
     
  • Pull NFS client bugfixes from Trond Myklebust:
    - Fix an NFSv4 idmapper regression
    - Fix an Oops in the pNFS blocks client
    - Fix up various issues with pNFS layoutcommit
    - Ensure correct read ordering of variables in
    rpc_wake_up_task_queue_locked

    * tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
    NFSv4.1: Add a helper pnfs_commit_and_return_layout
    NFSv4.1: Always clear the NFS_INO_LAYOUTCOMMIT in layoutreturn
    NFSv4.1: Fix a race in pNFS layoutcommit
    pnfs-block: removing DM device maybe cause oops when call dev_remove
    NFSv4: Fix the string length returned by the idmapper

    Linus Torvalds
     
  • …l/git/sarah/xhci into usb-linus

    Misc xHCI fixes for 3.9

    Hi Greg,

    Here's a couple of fixes for the xHCI driver. Three patches are nothing
    major: build warning fix, macro field width fix, and removing some
    unnecessary log spam.

    The only interesting thing here is Tianyu's two patches to fix the USB
    port connection type discovery, for the USB port power off mechanism.
    This adds new USB host API, but as discussed, it's necessary to avoid
    powering off the wrong USB port. It's not marked for backport to stable
    kernels, since the sysfs mechanism to manually power off a port didn't
    go in until 3.9.

    I've smoke tested these, including system suspend, USB device suspend,
    and rocking out in my cube with a pair of USB headphones. They look
    fine to me.

    Hibernate is currently broken on my system, due to some nouveau MMIO
    read faults. I'll report that separately.

    Sarah Sharp

    Greg Kroah-Hartman
     
  • Change the permission check for yama_ptrace_ptracee to the standard
    ptrace permission check, testing if the traceer has CAP_SYS_PTRACE
    in the tracees user namespace.

    Reviewed-by: Kees Cook
    Signed-off-by: "Eric W. Biederman"

    Eric W. Biederman