Linux 4.9.257
Greg Kroah-Hartman
maintainerI'm announcing the release of the 4.9.257 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 10 - arch/arm/mach-footbridge/dc21285.c | 12 - arch/x86/Makefile | 3 arch/x86/include/asm/apic.h | 10 - arch/x86/include/asm/barrier.h | 18 ++ arch/x86/kernel/apic/apic.c | 4 arch/x86/kernel/apic/x2apic_cluster.c | 6 arch/x86/kernel/apic/x2apic_phys.c | 6 drivers/acpi/thermal.c | 55 ++++-- drivers/input/joystick/xpad.c | 17 +- drivers/input/serio/i8042-x86ia64io.h | 2 drivers/iommu/intel-iommu.c | 6 drivers/mmc/core/sdio_cis.c | 6 drivers/net/dsa/bcm_sf2.c | 8 drivers/net/ethernet/ibm/ibmvnic.c | 6 drivers/scsi/ibmvscsi/ibmvfc.c | 4 drivers/scsi/libfc/fc_exch.c | 16 + drivers/usb/class/usblp.c | 19 +- drivers/usb/dwc2/gadget.c | 8 drivers/usb/gadget/legacy/ether.c | 4 drivers/usb/host/xhci-ring.c | 31 ++- drivers/usb/serial/cp210x.c | 2 drivers/usb/serial/option.c | 6 fs/cifs/dir.c | 22 ++ fs/hugetlbfs/inode.c | 3 include/linux/elfcore.h | 22 ++ include/linux/hugetlb.h | 3 kernel/Makefile | 1 kernel/elfcore.c | 25 --- kernel/futex.c | 276 +++++++++++++++++++--------------- kernel/kprobes.c | 4 kernel/locking/rtmutex-debug.c | 9 - kernel/locking/rtmutex-debug.h | 3 kernel/locking/rtmutex.c | 127 +++++++++------ kernel/locking/rtmutex.h | 2 kernel/locking/rtmutex_common.h | 12 - mm/huge_memory.c | 37 ++-- mm/hugetlb.c | 9 - net/lapb/lapb_out.c | 3 net/mac80211/driver-ops.c | 5 net/mac80211/rate.c | 3 net/mac80211/rx.c | 2 net/sched/sch_api.c | 3 sound/pci/hda/patch_realtek.c | 2 tools/objtool/elf.c | 7 45 files changed, 520 insertions(+), 319 deletions(-)
Alexey Dobriyan (1):
Input: i8042 - unbreak Pegatron C15B
Arnd Bergmann (1):
elfcore: fix building with clang
Aurelien Aptel (1):
cifs: report error instead of invalid when revalidating a dentry fails
Benjamin Valentin (1):
Input: xpad - sync supported devices with fork on GitHub
Brian King (1):
scsi: ibmvfc: Set default timeout to avoid crash during migration
Chenxin Jin (1):
USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
Christoph Schemmel (1):
USB: serial: option: Adding support for Cinterion MV31
Dan Carpenter (1):
USB: gadget: legacy: fix an error code in eth_bind()
Dave Hansen (1):
x86/apic: Add extra serialization for non-serializing MSRs
Eric Dumazet (1):
net_sched: reject silly cell_log in qdisc_get_rtab()
Felix Fietkau (2):
mac80211: fix fast-rx encryption check
mac80211: fix station rate table updates on assoc
Fengnan Chang (1):
mmc: core: Limit retries when analyse of SDIO tuples fails
Greg Kroah-Hartman (1):
Linux 4.9.257
Heiko Stuebner (1):
usb: dwc2: Fix endpoint direction check in ep_from_windex
Hugh Dickins (1):
mm: thp: fix MADV_REMOVE deadlock on shmem THP
Javed Hasan (1):
scsi: libfc: Avoid invoking response handler twice if ep is already completed
Jeremy Figgins (1):
USB: usblp: don't call usb_set_interface if there's a single alt
Josh Poimboeuf (2):
objtool: Don't fail on missing symbol table x86/build: Disable CET instrumentation in the kernel
Lijun Pan (1):
ibmvnic: Ensure that CRQ entry read are correctly ordered
Mathias Nyman (1):
xhci: fix bounce buffer usage for non-sg list case
Muchun Song (3):
mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
mm: hugetlb: fix a race between isolating and freeing page
mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
Nadav Amit (1):
iommu/vt-d: Do not use flush-queue when caching-mode is on
Pan Bian (1):
net: dsa: bcm_sf2: put device node before return
Peter Zijlstra (4):
futex,rt_mutex: Provide futex specific rt_mutex API
futex: Remove rt_mutex_deadlock_account_*()
futex: Rework inconsistent rt_mutex/futex_q state
futex: Avoid violating the 10th rule of futex
Pho Tran (1):
USB: serial: cp210x: add pid/vid for WSDA-200-USB
Rafael J. Wysocki (1):
ACPI: thermal: Do not call acpi_thermal_check() directly
Russell King (1):
ARM: footbridge: fix dc21285 PCI configuration accessors
Sasha Levin (1):
stable: clamp SUBLEVEL in 4.4 and 4.9
Shih-Yuan Lee (FourDollars) (1):
ALSA: hda/realtek - Fix typo of pincfg for Dell quirk
Thomas Gleixner (6):
futex: Replace pointless printk in fixup_owner()
futex: Provide and use pi_state_update_owner()
rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
futex: Use pi_state_update_owner() in put_pi_state()
futex: Simplify fixup_pi_state_owner()
futex: Handle faults correctly for PI futexes
Wang ShaoBo (1):
kretprobe: Avoid re-registration of the same kretprobe earlier
Xie He (1):
net: lapb: Copy the skb before sending a packet
Greg Kroah-Hartman
maintainerMakefile +2 -8
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 256 +SUBLEVEL = 257 EXTRAVERSION = NAME = Roaring Lionus
@@ -841,12 +841,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) # change __FILE__ to the relative path from the srctree KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) -# ensure -fcf-protection is disabled when using retpoline as it is -# incompatible with -mindirect-branch=thunk-extern -ifdef CONFIG_RETPOLINE -KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) -endif - # use the deterministic mode of AR if available KBUILD_ARFLAGS := $(call ar-option,D)
@@ -1141,7 +1135,7 @@ endef define filechk_version.h (echo \#define LINUX_VERSION_CODE $(shell \ - expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ + expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef
arch/arm/mach-footbridge/dc21285.c +6 -6
@@ -69,15 +69,15 @@ dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where,if (addr)switch (size) {case 1 : - asm("ldrb %0, [%1, %2]" + asmvolatile ("ldrb %0, [%1, %2]" :"=r" (v) :"r" (addr),"r" (where) :"cc" );break ;case 2 : - asm("ldrh %0, [%1, %2]" + asmvolatile ("ldrh %0, [%1, %2]" :"=r" (v) :"r" (addr),"r" (where) :"cc" );break ;case 4 : - asm("ldr %0, [%1, %2]" + asmvolatile ("ldr %0, [%1, %2]" :"=r" (v) :"r" (addr),"r" (where) :"cc" );break ; }
@@ -103,17 +103,17 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where,if (addr)switch (size) {case 1 : - asm("strb %0, [%1, %2]" + asmvolatile ("strb %0, [%1, %2]" : :"r" (value),"r" (addr),"r" (where) :"cc" );break ;case 2 : - asm("strh %0, [%1, %2]" + asmvolatile ("strh %0, [%1, %2]" : :"r" (value),"r" (addr),"r" (where) :"cc" );break ;case 4 : - asm("str %0, [%1, %2]" + asmvolatile ("str %0, [%1, %2]" : :"r" (value),"r" (addr),"r" (where) :"cc" );break ;
arch/x86/Makefile +3 -0
@@ -137,6 +137,9 @@ else KBUILD_CFLAGS += -mno-red-zone KBUILD_CFLAGS += -mcmodel=kernel + # Intel CET isn't enabled in the kernel + KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) + # -funit-at-a-time shrinks the kernel .text considerably # unfortunately it makes reading oopses harder. KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
arch/x86/include/asm/apic.h +0 -10
@@ -176,16 +176,6 @@ static inline void lapic_update_tsc_freq(void) { }#endif /* !CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_X86_X2APIC -/* -* Make previous memory operations globally visible before -* sending the IPI through x2apic wrmsr. We need a serializing instruction or -* mfence for this. -*/ -static inline void x2apic_wrmsr_fence (void ) -{ - asmvolatile ("mfence" : : :"memory" ); -} -static inline void native_apic_msr_write (u32 reg,u32 v) { if (reg == APIC_DFR || reg == APIC_ID || reg == APIC_LDR ||
arch/x86/include/asm/barrier.h +18 -0
@@ -110,4 +110,22 @@ do { \#include <asm-generic/barrier.h> +/* +* Make previous memory operations globally visible before +* a WRMSR. +* +* MFENCE makes writes visible, but only affects load/store +* instructions. WRMSR is unfortunately not a load/store +* instruction and is unaffected by MFENCE. The LFENCE ensures +* that the WRMSR is not reordered. +* +* Most WRMSRs are full serializing instructions themselves and +* do not require this barrier. This is only required for the +* IA32_TSC_DEADLINE and X2APIC MSRs. +*/ +static inline void weak_wrmsr_fence (void ) +{ + asmvolatile ("mfence; lfence" : : :"memory" ); +} +#endif /* _ASM_X86_BARRIER_H */
arch/x86/kernel/apic/apic.c +4 -0
@@ -42,6 +42,7 @@#include <asm/x86_init.h> #include <asm/pgalloc.h> #include <linux/atomic.h> +#include <asm/barrier.h> #include <asm/mpspec.h> #include <asm/i8259.h> #include <asm/proto.h>
@@ -476,6 +477,9 @@ static int lapic_next_deadline(unsigned long delta, {u64 tsc; +/* This MSR is special and need a special fence: */ +weak_wrmsr_fence (); + tsc =rdtsc ();wrmsrl (MSR_IA32_TSC_DEADLINE , tsc + (((u64 ) delta) *TSC_DIVISOR ));return 0 ;
arch/x86/kernel/apic/x2apic_cluster.c +4 -2
@@ -27,7 +27,8 @@ static void x2apic_send_IPI(int cpu, int vector) {u32 dest =per_cpu (x86_cpu_to_logical_apicid, cpu); -x2apic_wrmsr_fence (); +/* x2apic MSRs are special and need a special fence: */ +weak_wrmsr_fence ();__x2apic_send_IPI_dest (dest, vector,APIC_DEST_LOGICAL ); }
@@ -40,7 +41,8 @@ __x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)unsigned long flags;u32 dest; -x2apic_wrmsr_fence (); +/* x2apic MSRs are special and need a special fence: */ +weak_wrmsr_fence ();local_irq_save (flags);
arch/x86/kernel/apic/x2apic_phys.c +4 -2
@@ -40,7 +40,8 @@ static void x2apic_send_IPI(int cpu, int vector) {u32 dest =per_cpu (x86_cpu_to_apicid, cpu); -x2apic_wrmsr_fence (); +/* x2apic MSRs are special and need a special fence: */ +weak_wrmsr_fence ();__x2apic_send_IPI_dest (dest, vector,APIC_DEST_PHYSICAL ); }
@@ -51,7 +52,8 @@ __x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)unsigned long this_cpu;unsigned long flags; -x2apic_wrmsr_fence (); +/* x2apic MSRs are special and need a special fence: */ +weak_wrmsr_fence ();local_irq_save (flags);
drivers/acpi/thermal.c +38 -17
117 lines not on this page · raw message
drivers/input/joystick/xpad.c +16 -1
@@ -232,9 +232,17 @@ static const struct xpad_device { { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, - { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -313,6 +321,9 @@ static const struct xpad_device { { 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 }, + { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, + { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, + { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE }, { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
@@ -446,8 +457,12 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x162e ),/* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR (0x1689 ),/* Razer Onza */ XPAD_XBOX360_VENDOR (0x1bad ),/* Harminix Rock Band Guitar and Drums */ +XPAD_XBOX360_VENDOR (0x20d6 ),/* PowerA Controllers */ +XPAD_XBOXONE_VENDOR (0x20d6 ),/* PowerA Controllers */ XPAD_XBOX360_VENDOR (0x24c6 ),/* PowerA Controllers */ XPAD_XBOXONE_VENDOR (0x24c6 ),/* PowerA Controllers */ +XPAD_XBOXONE_VENDOR (0x2e24 ),/* Hyperkin Duke X-Box One pad */ + XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ { } };
drivers/input/serio/i8042-x86ia64io.h +2 -0
@@ -223,6 +223,8 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {DMI_MATCH (DMI_SYS_VENDOR ,"PEGATRON CORPORATION" ), DMI_MATCH(DMI_PRODUCT_NAME, "C15B"), }, + }, + { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ByteSpeed LLC" ), DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),
drivers/iommu/intel-iommu.c +6 -0
@@ -3323,6 +3323,12 @@ static int __init init_dmars(void)if (!ecap_pass_through (iommu->ecap)) hw_pass_through =0 ; + +if (!intel_iommu_strict &&cap_caching_mode (iommu->cap)) { +pr_info ("Disable batched IOTLB flush due to virtualization" ); + intel_iommu_strict =1 ; + } +#ifdef CONFIG_INTEL_IOMMU_SVM if (pasid_enabled (iommu))intel_svm_alloc_pasid_tables (iommu);
drivers/mmc/core/sdio_cis.c +6 -0
@@ -24,6 +24,8 @@#include "sdio_cis.h" #include "sdio_ops.h" +#define SDIO_READ_CIS_TIMEOUT_MS (10 * 1000)/* 10s */ +static int cistpl_vers_1 (struct mmc_card *card,struct sdio_func *func,const unsigned char *buf,unsigned size) {
@@ -269,6 +271,8 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) do { unsigned char tpl_code, tpl_link; + unsigned long timeout = jiffies + + msecs_to_jiffies(SDIO_READ_CIS_TIMEOUT_MS); ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_code); if (ret)
@@ -321,6 +325,8 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) prev = &this->next;if (ret == -ENOENT ) { +if (time_after (jiffies, timeout)) +break ;/* warn about unknown tuples */ pr_warn_ratelimited("%s: queuing unknown" " CIS tuple 0x%02x (%u bytes)\n",
drivers/net/dsa/bcm_sf2.c +6 -2
@@ -515,15 +515,19 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)/* Find our integrated MDIO bus node */ dn =of_find_compatible_node (NULL ,NULL ,"brcm,unimac-mdio" ); priv->master_mii_bus =of_mdio_find_bus (dn); -if (!priv->master_mii_bus) +if (!priv->master_mii_bus) { +of_node_put (dn);return -EPROBE_DEFER ; + }get_device (&priv->master_mii_bus->dev); priv->master_mii_dn = dn; priv->slave_mii_bus =devm_mdiobus_alloc (ds->dev); -if (!priv->slave_mii_bus) +if (!priv->slave_mii_bus) { +of_node_put (dn);return -ENOMEM ; + } priv->slave_mii_bus->priv = priv; priv->slave_mii_bus->name ="sf2 slave mii" ;
drivers/net/ethernet/ibm/ibmvnic.c +6 -0
@@ -3496,6 +3496,12 @@ static irqreturn_t ibmvnic_interrupt(int irq, void *instance)while (!done) {/* Pull all the valid messages off the CRQ */ while ((crq =ibmvnic_next_crq (adapter)) !=NULL ) { +/* This barrier makes sure ibmvnic_next_crq()'s +* crq->generic.first & IBMVNIC_CRQ_CMD_RSP is loaded +* before ibmvnic_handle_crq()'s +* switch(gen_crq->first) and switch(gen_crq->cmd). +*/ +dma_rmb ();ibmvnic_handle_crq (crq, adapter); crq->generic.first =0 ; }
drivers/scsi/ibmvscsi/ibmvfc.c +3 -1
@@ -2891,8 +2891,10 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)unsigned long flags =0 ;spin_lock_irqsave (shost->host_lock, flags); -if (sdev->type ==TYPE_DISK ) +if (sdev->type ==TYPE_DISK ) { sdev->allow_restart =1 ; +blk_queue_rq_timeout (sdev->request_queue,120 *HZ ); + }spin_unlock_irqrestore (shost->host_lock, flags);return 0 ; }
drivers/scsi/libfc/fc_exch.c +14 -2
@@ -1585,8 +1585,13 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) rc =fc_exch_done_locked (ep);WARN_ON (fc_seq_exch (sp) != ep);spin_unlock_bh (&ep->ex_lock); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + } }/*
@@ -1605,6 +1610,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)if (!fc_invoke_resp (ep, sp, fp))fc_frame_free (fp); +skip_resp:fc_exch_release (ep);return ; rel:
@@ -1848,10 +1854,16 @@ static void fc_exch_reset(struct fc_exch *ep)fc_exch_hold (ep); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + }fc_invoke_resp (ep, sp,ERR_PTR (-FC_EX_CLOSED )); +skip_resp:fc_seq_set_resp (sp,NULL , ep->arg);fc_exch_release (ep); }
drivers/usb/class/usblp.c +11 -8
@@ -1349,14 +1349,17 @@ static int usblp_set_protocol(struct usblp *usblp, int protocol)if (protocol <USBLP_FIRST_PROTOCOL || protocol >USBLP_LAST_PROTOCOL )return -EINVAL ; - alts = usblp->protocol[protocol].alt_setting; -if (alts <0 ) -return -EINVAL ; - r =usb_set_interface (usblp->dev, usblp->ifnum, alts); -if (r <0 ) { -printk (KERN_ERR "usblp: can't set desired altsetting %d on interface %d\n" , - alts, usblp->ifnum); -return r; +/* Don't unnecessarily set the interface if there's a single alt. */ +if (usblp->intf->num_altsetting >1 ) { + alts = usblp->protocol[protocol].alt_setting; +if (alts <0 ) +return -EINVAL ; + r =usb_set_interface (usblp->dev, usblp->ifnum, alts); +if (r <0 ) { +printk (KERN_ERR "usblp: can't set desired altsetting %d on interface %d\n" , + alts, usblp->ifnum); +return r; + } } usblp->bidir = (usblp->protocol[protocol].epread !=NULL );
drivers/usb/dwc2/gadget.c +1 -7
@@ -942,7 +942,6 @@ static void dwc2_hsotg_complete_oursetup(struct usb_ep *ep,static struct dwc2_hsotg_ep *ep_from_windex (struct dwc2_hsotg *hsotg,u32 windex) { -struct dwc2_hsotg_ep *ep;int dir = (windex &USB_DIR_IN ) ?1 :0 ;int idx = windex &0x7F ;
@@ -952,12 +951,7 @@ static struct dwc2_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,if (idx > hsotg->num_of_eps)return NULL ; - ep =index_to_ep (hsotg, idx, dir); - -if (idx && ep->dir_in != dir) -return NULL ; - -return ep; +return index_to_ep (hsotg, idx, dir); }/**
drivers/usb/gadget/legacy/ether.c +3 -1
@@ -407,8 +407,10 @@ static int eth_bind(struct usb_composite_dev *cdev)struct usb_descriptor_header *usb_desc; usb_desc =usb_otg_descriptor_alloc (gadget); -if (!usb_desc) +if (!usb_desc) { + status = -ENOMEM ; goto fail1; + }usb_otg_descriptor_init (gadget, usb_desc); otg_desc[0 ] = usb_desc; otg_desc[1 ] =NULL ;
drivers/usb/host/xhci-ring.c +20 -11
@@ -692,11 +692,16 @@ void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci, struct xhci_ring *ring,dma_unmap_single (dev, seg->bounce_dma, ring->bounce_buf_len,DMA_FROM_DEVICE );/* for in tranfers we need to copy the data from bounce to sg */ - len =sg_pcopy_from_buffer (urb->sg, urb->num_sgs, seg->bounce_buf, - seg->bounce_len, seg->bounce_offs); -if (len != seg->bounce_len) -xhci_warn (xhci,"WARN Wrong bounce buffer read length: %zu != %d\n" , - len, seg->bounce_len); +if (urb->num_sgs) { + len =sg_pcopy_from_buffer (urb->sg, urb->num_sgs, seg->bounce_buf, + seg->bounce_len, seg->bounce_offs); +if (len != seg->bounce_len) +xhci_warn (xhci,"WARN Wrong bounce buffer read length: %zu != %d\n" , + len, seg->bounce_len); + }else { +memcpy (urb->transfer_buffer + seg->bounce_offs, seg->bounce_buf, + seg->bounce_len); + } seg->bounce_len =0 ; seg->bounce_offs =0 ; }
@@ -3196,12 +3201,16 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,/* create a max max_pkt sized bounce buffer pointed to by last trb */ if (usb_urb_dir_out (urb)) { - len =sg_pcopy_to_buffer (urb->sg, urb->num_sgs, - seg->bounce_buf, new_buff_len, enqd_len); -if (len != new_buff_len) -xhci_warn (xhci, -"WARN Wrong bounce buffer write length: %zu != %d\n" , - len, new_buff_len); +if (urb->num_sgs) { + len =sg_pcopy_to_buffer (urb->sg, urb->num_sgs, + seg->bounce_buf, new_buff_len, enqd_len); +if (len != new_buff_len) +xhci_warn (xhci,"WARN Wrong bounce buffer write length: %zu != %d\n" , + len, new_buff_len); + }else { +memcpy (seg->bounce_buf, urb->transfer_buffer + enqd_len, new_buff_len); + } + seg->bounce_dma =dma_map_single (dev, seg->bounce_buf, max_pkt,DMA_TO_DEVICE ); }else {
drivers/usb/serial/cp210x.c +2 -0
@@ -58,6 +58,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ { USB_DEVICE(0x0908, 0x01FF) }, /* Siemens RUGGEDCOM USB Serial Console */ + { USB_DEVICE(0x0988, 0x0578) }, /* Teraoka AD2000 */ { USB_DEVICE(0x0B00, 0x3070) }, /* Ingenico 3070 */ { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ { USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */
@@ -198,6 +199,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */ { USB_DEVICE(0x1901, 0x0195) }, /* GE B850/B650/B450 CP2104 DP UART interface */ { USB_DEVICE(0x1901, 0x0196) }, /* GE B850 CP2105 DP UART interface */ + { USB_DEVICE(0x199B, 0xBA30) }, /* LORD WSDA-200-USB */ { USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
drivers/usb/serial/option.c +6 -0
@@ -425,6 +425,8 @@ static void option_instat_callback(struct urb *urb);#define CINTERION_PRODUCT_AHXX_2RMNET 0x0084#define CINTERION_PRODUCT_AHXX_AUDIO 0x0085#define CINTERION_PRODUCT_CLS8 0x00b0 +#define CINTERION_PRODUCT_MV31_MBIM 0x00b3 +#define CINTERION_PRODUCT_MV31_RMNET 0x00b7/* Olivetti products */ #define OLIVETTI_VENDOR_ID 0x0b3c
@@ -1896,6 +1898,10 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) }, { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */ { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_MBIM, 0xff), + .driver_info = RSVD(3)}, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), + .driver_info = RSVD(0)}, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), .driver_info = RSVD(4) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
fs/cifs/dir.c +20 -2
@@ -830,6 +830,7 @@ static int cifs_d_revalidate(struct dentry *direntry, unsigned int flags) {struct inode *inode; +int rc;if (flags &LOOKUP_RCU )return -ECHILD ;
@@ -839,8 +840,25 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags)if ((flags &LOOKUP_REVAL ) && !CIFS_CACHE_READ (CIFS_I (inode)))CIFS_I (inode)->time =0 ;/* force reval */ -if (cifs_revalidate_dentry (direntry)) -return 0 ; + rc =cifs_revalidate_dentry (direntry); +if (rc) { +cifs_dbg (FYI ,"cifs_revalidate_dentry failed with rc=%d" , rc); +switch (rc) { +case -ENOENT : +case -ESTALE : +/* +* Those errors mean the dentry is invalid +* (file was deleted or recreated) +*/ +return 0 ; +default : +/* +* Otherwise some unexpected error happened +* report it as-is to VFS layer +*/ +return rc; + } + }else {/* * If the inode wasn't known to be a dfs entry when
fs/hugetlbfs/inode.c +2 -1
@@ -665,8 +665,9 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,mutex_unlock (&hugetlb_fault_mutex_table[hash]); +set_page_huge_active (page);/* -* page_put due to reference from alloc_huge_page() +* put_page() due to reference from alloc_huge_page() * unlock_page because locked by add_to_page_cache() */ put_page (page);
include/linux/elfcore.h +22 -0
@@ -55,6 +55,7 @@ static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregse }#endif +#if defined(CONFIG_UM ) || defined(CONFIG_IA64 )/* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its
@@ -69,5 +70,26 @@ elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset);extern int elf_core_write_extra_data (struct coredump_params *cprm);extern size_t elf_core_extra_data_size (void ); +#else +static inline Elf_Half elf_core_extra_phdrs (void ) +{ +return 0 ; +} + +static inline int elf_core_write_extra_phdrs (struct coredump_params *cprm,loff_t offset) +{ +return 1 ; +} + +static inline int elf_core_write_extra_data (struct coredump_params *cprm) +{ +return 1 ; +} + +static inline size_t elf_core_extra_data_size (void ) +{ +return 0 ; +} +#endif #endif /* _LINUX_ELFCORE_H */
include/linux/hugetlb.h +3 -0
@@ -502,6 +502,9 @@ static inline void hugetlb_count_sub(long l, struct mm_struct *mm) {atomic_long_sub (l, &mm->hugetlb_usage); } + +void set_page_huge_active (struct page *page); +#else /* CONFIG_HUGETLB_PAGE */ struct hstate {};#define alloc_huge_page (v, a, r) NULL
kernel/Makefile +0 -1
@@ -90,7 +90,6 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o -obj-$(CONFIG_ELFCORE) += elfcore.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_TRACE_CLOCK) += trace/
kernel/elfcore.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <linux/elf.h> -#include <linux/fs.h> -#include <linux/mm.h> -#include <linux/binfmts.h> -#include <linux/elfcore.h> - -Elf_Half __weak elf_core_extra_phdrs (void ) -{ -return 0 ; -} - -int __weak elf_core_write_extra_phdrs (struct coredump_params *cprm,loff_t offset) -{ -return 1 ; -} - -int __weak elf_core_write_extra_data (struct coredump_params *cprm) -{ -return 1 ; -} - -size_t __weak elf_core_extra_data_size (void ) -{ -return 0 ; -}
kernel/futex.c +158 -118
409 lines not on this page · raw message
kernel/kprobes.c +4 -0
@@ -1884,6 +1884,10 @@ int register_kretprobe(struct kretprobe *rp)int i;void *addr; +/* If only rp->kp.addr is specified, check reregistering kprobes */ +if (rp->kp.addr &&check_kprobe_rereg (&rp->kp)) +return -EINVAL ; +if (kretprobe_blacklist_size) { addr =kprobe_addr (&rp->kp);if (IS_ERR (addr))
kernel/locking/rtmutex-debug.c +0 -9
@@ -173,12 +173,3 @@ void debug_rt_mutex_init(struct rt_mutex *lock, const char *name) lock->name = name; } -void -rt_mutex_deadlock_account_lock (struct rt_mutex *lock,struct task_struct *task) -{ -} - -void rt_mutex_deadlock_account_unlock (struct task_struct *task) -{ -} -
kernel/locking/rtmutex-debug.h +0 -3
@@ -9,9 +9,6 @@* This file contains macros used solely by rtmutex.c. Debug version. */ -extern void -rt_mutex_deadlock_account_lock (struct rt_mutex *lock,struct task_struct *task); -extern void rt_mutex_deadlock_account_unlock (struct task_struct *task);extern void debug_rt_mutex_init_waiter (struct rt_mutex_waiter *waiter);extern void debug_rt_mutex_free_waiter (struct rt_mutex_waiter *waiter);extern void debug_rt_mutex_init (struct rt_mutex *lock,const char *name);
kernel/locking/rtmutex.c +77 -50
217 lines not on this page · raw message
kernel/locking/rtmutex.h +0 -2
@@ -11,8 +11,6 @@*/ #define rt_mutex_deadlock_check (l) (0) -#define rt_mutex_deadlock_account_lock (m, t) do { } while (0) -#define rt_mutex_deadlock_account_unlock (l) do { } while (0)#define debug_rt_mutex_init_waiter (w) do { } while (0)#define debug_rt_mutex_free_waiter (w) do { } while (0)#define debug_rt_mutex_lock (l) do { } while (0)
kernel/locking/rtmutex_common.h +8 -4
@@ -102,8 +102,7 @@ enum rtmutex_chainwalk {extern struct task_struct *rt_mutex_next_owner (struct rt_mutex *lock);extern void rt_mutex_init_proxy_locked (struct rt_mutex *lock,struct task_struct *proxy_owner); -extern void rt_mutex_proxy_unlock (struct rt_mutex *lock, -struct task_struct *proxy_owner); +extern void rt_mutex_proxy_unlock (struct rt_mutex *lock);extern int rt_mutex_start_proxy_lock (struct rt_mutex *lock,struct rt_mutex_waiter *waiter,struct task_struct *task);
@@ -113,8 +112,13 @@ extern int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,extern bool rt_mutex_cleanup_proxy_lock (struct rt_mutex *lock,struct rt_mutex_waiter *waiter);extern int rt_mutex_timed_futex_lock (struct rt_mutex *l,struct hrtimer_sleeper *to); -extern bool rt_mutex_futex_unlock (struct rt_mutex *lock, -struct wake_q_head *wqh); +extern int rt_mutex_futex_trylock (struct rt_mutex *l); +extern int __rt_mutex_futex_trylock (struct rt_mutex *l); + +extern void rt_mutex_futex_unlock (struct rt_mutex *lock); +extern bool __rt_mutex_futex_unlock (struct rt_mutex *lock, +struct wake_q_head *wqh); +extern void rt_mutex_adjust_prio (struct task_struct *task);#ifdef CONFIG_DEBUG_RT_MUTEXES
mm/huge_memory.c +23 -14
@@ -1753,7 +1753,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,spinlock_t *ptl;struct mm_struct *mm = vma->vm_mm;unsigned long haddr = address &HPAGE_PMD_MASK ; -bool was_locked = false; +bool do_unlock_page = false;pmd_t _pmd;mmu_notifier_invalidate_range_start (mm, haddr, haddr +HPAGE_PMD_SIZE );
@@ -1766,7 +1766,6 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,VM_BUG_ON (freeze && !page);if (page) {VM_WARN_ON_ONCE (!PageLocked (page)); - was_locked = true;if (page !=pmd_page (*pmd)) goto out; }
@@ -1775,19 +1774,29 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,if (pmd_trans_huge (*pmd)) {if (!page) { page =pmd_page (*pmd); -if (unlikely (!trylock_page (page))) { -get_page (page); - _pmd = *pmd; -spin_unlock (ptl); -lock_page (page); -spin_lock (ptl); -if (unlikely (!pmd_same (*pmd, _pmd))) { -unlock_page (page); +/* +* An anonymous page must be locked, to ensure that a +* concurrent reuse_swap_page() sees stable mapcount; +* but reuse_swap_page() is not used on shmem or file, +* and page lock must not be taken when zap_pmd_range() +* calls __split_huge_pmd() while i_mmap_lock is held. +*/ +if (PageAnon (page)) { +if (unlikely (!trylock_page (page))) { +get_page (page); + _pmd = *pmd; +spin_unlock (ptl); +lock_page (page); +spin_lock (ptl); +if (unlikely (!pmd_same (*pmd, _pmd))) { +unlock_page (page); +put_page (page); + page =NULL ; + goto repeat; + }put_page (page); - page =NULL ; - goto repeat; } -put_page (page); + do_unlock_page = true; } }if (PageMlocked (page))
@@ -1797,7 +1806,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,__split_huge_pmd_locked (vma, pmd, haddr, freeze); out:spin_unlock (ptl); -if (!was_locked && page) +if (do_unlock_page)unlock_page (page);mmu_notifier_invalidate_range_end (mm, haddr, haddr +HPAGE_PMD_SIZE ); }
mm/hugetlb.c +4 -5
@@ -1210,12 +1210,11 @@ struct hstate *size_to_hstate(unsigned long size)*/ bool page_huge_active (struct page *page) { -VM_BUG_ON_PAGE (!PageHuge (page), page); -return PageHead (page) &&PagePrivate (&page[1 ]); +return PageHeadHuge (page) &&PagePrivate (&page[1 ]); }/* never called for tail page */ -static void set_page_huge_active (struct page *page) +void set_page_huge_active (struct page *page) {VM_BUG_ON_PAGE (!PageHeadHuge (page), page);SetPagePrivate (&page[1 ]);
@@ -4657,9 +4656,9 @@ bool isolate_huge_page(struct page *page, struct list_head *list) {bool ret = true; -VM_BUG_ON_PAGE (!PageHead (page), page);spin_lock (&hugetlb_lock); -if (!page_huge_active (page) || !get_page_unless_zero (page)) { +if (!PageHeadHuge (page) || !page_huge_active (page) || + !get_page_unless_zero (page)) { ret = false; goto unlock; }
net/lapb/lapb_out.c +2 -1
@@ -87,7 +87,8 @@ void lapb_kick(struct lapb_cb *lapb) skb =skb_dequeue (&lapb->write_queue); do { - if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) { + skbn = skb_copy(skb, GFP_ATOMIC); + if (!skbn) { skb_queue_head(&lapb->write_queue, skb); break; }
net/mac80211/driver-ops.c +4 -1
@@ -128,8 +128,11 @@ int drv_sta_state(struct ieee80211_local *local, }else if (old_state ==IEEE80211_STA_AUTH && new_state ==IEEE80211_STA_ASSOC ) { ret =drv_sta_add (local, sdata, &sta->sta); -if (ret ==0 ) +if (ret ==0 ) { sta->uploaded = true; +if (rcu_access_pointer (sta->sta.rates)) +drv_sta_rate_tbl_update (local, sdata, &sta->sta); + } }else if (old_state ==IEEE80211_STA_ASSOC && new_state ==IEEE80211_STA_AUTH ) {drv_sta_remove (local, sdata, &sta->sta);
net/mac80211/rate.c +2 -1
@@ -892,7 +892,8 @@ int rate_control_set_rates(struct ieee80211_hw *hw,if (old)kfree_rcu (old, rcu_head); -drv_sta_rate_tbl_update (hw_to_local (hw), sta->sdata, pubsta); +if (sta->uploaded) +drv_sta_rate_tbl_update (hw_to_local (hw), sta->sdata, pubsta);return 0 ; }
net/mac80211/rx.c +2 -0
@@ -3802,6 +3802,8 @@ void ieee80211_check_fast_rx(struct sta_info *sta)rcu_read_lock (); key =rcu_dereference (sta->ptk[sta->ptk_idx]); +if (!key) + key =rcu_dereference (sdata->default_unicast_key);if (key) {switch (key->conf.cipher) {case WLAN_CIPHER_SUITE_TKIP :
net/sched/sch_api.c +2 -1
@@ -393,7 +393,8 @@ struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, {struct qdisc_rate_table *rtab; -if (tab ==NULL || r->rate ==0 || r->cell_log ==0 || +if (tab ==NULL || r->rate ==0 || + r->cell_log ==0 || r->cell_log >=32 ||nla_len (tab) !=TC_RTAB_SIZE )return NULL ;
sound/pci/hda/patch_realtek.c +1 -1
@@ -6284,7 +6284,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0299, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x12, 0xb7a60130}, - {0x13, 0xb8a60140}, + {0x13, 0xb8a61140}, {0x17, 0x90170110}), {} };
tools/objtool/elf.c +5 -2
@@ -226,8 +226,11 @@ static int read_symbols(struct elf *elf) symtab =find_section_by_name (elf,".symtab" );if (!symtab) { -WARN ("missing symbol table" ); -return -1 ; +/* +* A missing symbol table is actually possible if it's an empty +* .o file. This can happen for thunk_64.o. +*/ +return 0 ; } symbols_nr = symtab->sh.sh_size / symtab->sh.sh_entsize;