Linux 4.4.220
Greg KH
maintainerI'm announcing the release of the 4.4.220 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.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 | 2 arch/arm64/kernel/armv8_deprecated.c | 2 arch/mips/cavium-octeon/octeon-irq.c | 3 arch/powerpc/kernel/signal_64.c | 4 - arch/powerpc/mm/tlb_nohash_low.S | 12 +++ arch/s390/kernel/diag.c | 2 arch/x86/boot/compressed/head_32.S | 2 arch/x86/boot/compressed/head_64.S | 4 - arch/x86/entry/entry_32.S | 1 arch/x86/entry/entry_64.S | 2 arch/x86/include/asm/microcode_intel.h | 2 arch/x86/include/asm/processor.h | 18 +++++ arch/x86/include/asm/spec-ctrl.h | 2 arch/x86/include/asm/vgtod.h | 2 arch/x86/kernel/acpi/boot.c | 2 arch/x86/kernel/cpu/bugs.c | 5 + arch/x86/kvm/cpuid.c | 3 arch/x86/kvm/x86.c | 11 +++ drivers/ata/libata-pmp.c | 1 drivers/ata/libata-scsi.c | 9 -- drivers/bus/sunxi-rsb.c | 2 drivers/char/ipmi/ipmi_msghandler.c | 4 - drivers/clk/at91/clk-usb.c | 3 drivers/clk/tegra/clk-tegra-pmc.c | 12 +-- drivers/crypto/mxs-dcp.c | 58 ++++++++---------- drivers/gpu/drm/drm_dp_mst_topology.c | 15 +++- drivers/i2c/busses/i2c-st.c | 1 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 -- drivers/input/serio/i8042-x86ia64io.h | 11 +++ drivers/iommu/amd_iommu_types.h | 2 drivers/irqchip/irq-versatile-fpga.c | 18 ++++- drivers/md/dm-flakey.c | 5 + drivers/mfd/dln2.c | 9 ++ drivers/mfd/rts5227.c | 1 drivers/misc/echo/echo.c | 2 drivers/mtd/devices/phram.c | 15 ++-- drivers/mtd/lpddr/lpddr_cmds.c | 1 drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 drivers/net/ethernet/neterion/vxge/vxge-main.h | 14 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 drivers/net/wireless/ath/ath9k/main.c | 3 drivers/net/wireless/ath/wil6210/debugfs.c | 7 +- drivers/net/wireless/ath/wil6210/main.c | 2 drivers/net/wireless/ath/wil6210/txrx.c | 4 - drivers/net/wireless/mac80211_hwsim.c | 12 +-- drivers/net/xen-netfront.c | 14 +++- drivers/of/base.c | 3 drivers/of/unittest.c | 7 +- drivers/rtc/rtc-pm8xxx.c | 49 +++++++++++---- drivers/s390/scsi/zfcp_erp.c | 2 drivers/scsi/sg.c | 4 - drivers/scsi/ufs/ufs-qcom.c | 2 drivers/scsi/ufs/ufshcd.c | 5 + drivers/soc/qcom/smem.c | 2 drivers/tty/ehv_bytechan.c | 21 +++++- drivers/usb/gadget/composite.c | 9 ++ drivers/usb/gadget/function/f_fs.c | 1 drivers/video/fbdev/core/fbmem.c | 2 drivers/video/fbdev/sis/init301.c | 4 - fs/btrfs/async-thread.c | 8 ++ fs/btrfs/async-thread.h | 2 fs/btrfs/disk-io.c | 13 ++++ fs/btrfs/relocation.c | 33 ++++++---- fs/btrfs/send.c | 7 +- fs/exec.c | 2 fs/ext2/xattr.c | 5 - fs/ext4/extents.c | 8 +- fs/ext4/inode.c | 2 fs/ext4/super.c | 9 +- fs/gfs2/glock.c | 3 fs/hfsplus/attributes.c | 4 + fs/jbd2/commit.c | 7 +- fs/nfs/direct.c | 2 fs/nfs/pagelist.c | 17 ++--- fs/ocfs2/alloc.c | 4 + include/linux/compiler.h | 2 include/linux/devfreq_cooling.h | 2 include/linux/percpu_counter.h | 4 - include/linux/sched.h | 4 - include/net/ip6_route.h | 1 kernel/futex.c | 12 +++ kernel/kmod.c | 4 - kernel/locking/lockdep.c | 4 + kernel/locking/locktorture.c | 8 +- kernel/signal.c | 2 kernel/trace/trace_events_trigger.c | 10 --- net/ipv4/devinet.c | 13 ++-- security/keys/key.c | 2 security/keys/keyctl.c | 4 - sound/core/oss/pcm_plugin.c | 32 +++++++-- sound/pci/hda/hda_beep.c | 6 + sound/pci/hda/hda_codec.c | 1 sound/pci/hda/hda_intel.c | 35 ++++++---- sound/pci/ice1712/prodigy_hifi.c | 4 - sound/soc/intel/atom/sst-atom-controls.c | 2 sound/soc/intel/atom/sst/sst_pci.c | 2 sound/soc/soc-dapm.c | 8 ++ sound/soc/soc-ops.c | 4 - sound/soc/soc-pcm.c | 6 + sound/soc/soc-topology.c | 2 sound/usb/mixer.c | 2 sound/usb/mixer_maps.c | 28 ++++++++ tools/testing/selftests/x86/ptrace_syscall.c | 8 +- 103 files changed, 530 insertions(+), 234 deletions(-)
Adrian Huang (1):
iommu/amd: Fix the configuration of GCR3 table root pointer
Alain Volmat (1):
i2c: st: fix missing struct parameter description
Alex Vesker (1):
IB/ipoib: Fix lockdep issue found on ipoib_ib_dev_heavy_flush
Andy Lutomirski (1):
selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault
Andy Shevchenko (1):
mfd: dln2: Fix sanity checking for endpoints
Arvind Sankar (1):
x86/boot: Use unsigned comparison for addresses
Bob Peterson (1):
gfs2: Don't demote a glock until its revokes are written
Boqun Feng (1):
locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps()
Borislav Petkov (2):
x86/mitigations: Clear CPU buffers on the SYSCALL fast path x86/CPU: Add native CPUID variants returning a single datum
Can Guo (1):
scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
Changwei Ge (1):
ocfs2: no need try to truncate file beyond i_size
Chris Lew (1):
soc: qcom: smem: Use le32_to_cpu for comparison
Claudiu Beznea (1):
clk: at91: usb: continue if clk_hw_round_rate() return zero
Colin Ian King (2):
ASoC: Intel: mrfld: fix incorrect check on p->sink
ASoC: Intel: mrfld: return error codes when an error occurs
Dan Carpenter (2):
fbdev: potential information leak in do_fb_ioctl()
mtd: lpddr: Fix a double free in probe()
Dedy Lansky (2):
wil6210: fix temperature debugfs
wil6210: rate limit wil_rx_refill error
Eric Biggers (1):
kmod: make request_module() return an error when autoloading is disabled
Eric Sandeen (1):
ext4: do not commit super on read-only bdev
Eric W. Biederman (1):
signal: Extend exec_id to 64bits
Evalds Iodzevics (1):
x86/microcode/intel: replace sync_core() with native_cpuid_reg(eax)
Filipe Manana (2):
Btrfs: incremental send, fix invalid memory access
Btrfs: fix crash during unmount due to race with delayed inode workers
Frank Rowand (1):
of: unittest: kmemleak in of_unittest_platform_populate()
Fredrik Strupe (1):
arm64: armv8_deprecated: Fix undef_hook mask for thumb setend
Goldwyn Rodrigues (1):
dm flakey: check for null arg_name in parse_features()
Greg Kroah-Hartman (1):
Linux 4.4.220
Gustavo A. R. Silva (1):
MIPS: OCTEON: irq: Fix potential NULL pointer dereference
Hamad Kadmany (1):
wil6210: increase firmware ready timeout
Hans de Goede (1):
Input: i8042 - add Acer Aspire 5738z to nomux list
Jan Engelhardt (1):
acpi/x86: ignore unspecified bit positions in the ACPI global lock field
Jan Kara (1):
ext4: do not zeroout extents beyond i_disksize
Jim Mattson (1):
kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD
Jiri Slaby (1):
futex: futex_wake_op, do not fail on invalid op
Joe Moriarty (1):
drm: NULL pointer dereference [null-pointer-deref] (CWE 476) problem
John Garry (1):
libata: Remove extra scsi_host_put() in ata_scsi_add_hosts()
Josef Bacik (2):
btrfs: remove a BUG_ON() from merge_reloc_roots()
btrfs: track reloc roots based on their commit root bytenr
Josh Triplett (2):
ext4: fix incorrect group count in ext4_fill_super error message
ext4: fix incorrect inodes per group in error message
Kai-Heng Feng (1):
libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set
Laurentiu Tudor (1):
powerpc/fsl_booke: Avoid creating duplicate tlb1 entry
Li Bin (1):
scsi: sg: add sg_remove_request in sg_common_write
Lyude Paul (1):
drm/dp_mst: Fix clearing payload state on topology disable
Martin Blumenstingl (1):
thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n
Michael Ellerman (1):
powerpc/64/tm: Don't let userspace set regs->trap via sigreturn
Michael Mueller (1):
s390/diag: fix display of diagnose call statistics
Misono Tomohiro (1):
NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails
Mohit Aggarwal (1):
rtc: pm8xxx: Fix issue in RTC write path
Nathan Chancellor (2):
misc: echo: Remove unnecessary parentheses and simplify check for zero
video: fbdev: sis: Remove unnecessary parentheses and commented code
Ondrej Jirman (1):
bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads
Paul E. McKenney (1):
locktorture: Print ratio of acquisitions, not failures
Qian Cai (2):
ext4: fix a data race at inode->i_blocks
percpu_counter: fix a data race at vm_committed_as
Randy Dunlap (1):
ext2: fix empty body warnings when -Wextra is used
Remi Pommarel (1):
ath9k: Handle txpower changes even when TPC is disabled
Rob Herring (1):
of: fix missing kobject init for !SYSFS && OF_DYNAMIC config
Rosioru Dragos (1):
crypto: mxs-dcp - fix scatterlist linearization for hash
Samuel Neves (1):
x86/vdso: Fix lsl operand order
Sean Christopherson (1):
KVM: x86: Allocate new rmap and large page tracking when moving memslot
Simon Gander (1):
hfsplus: fix crash and filesystem corruption when deleting files
Sowjanya Komatineni (1):
clk: tegra: Fix Tegra PMC clock out parents
Sriharsha Allenki (1):
usb: gadget: f_fs: Fix use after free issue as part of queue failure
Steffen Maier (1):
scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point
Stephen Rothwell (1):
tty: evh_bytechan: Fix out of bounds accesses
Subhash Jadavani (1):
scsi: ufs: ufs-qcom: remove broken hci version quirk
Sungbo Eo (2):
irqchip/versatile-fpga: Handle chained IRQs properly irqchip/versatile-fpga: Apply clear-mask earlier
Takashi Iwai (8):
ALSA: usb-audio: Add mixer workaround for TRX40 and co
ALSA: hda: Add driver blacklist
ALSA: hda: Fix potential access overflow in beep helper
ALSA: ice1724: Fix invalid access for enumerated ctl items
ALSA: pcm: oss: Fix regression by buffer overflow fix
ALSA: hda: Initialize power_state field properly
ALSA: usb-audio: Don't override ignore_ctl_error value from the map
ALSA: hda: Don't release card at firmware loading error
Taras Chornyi (1):
net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin
Thinh Nguyen (1):
usb: gadget: composite: Inform controller driver of self-powered
Thomas Gleixner (1):
x86/entry/32: Add missing ASM_CLAC to general_protection entry
Tim Stallard (1):
net: ipv6: do not consider routes via gateways for anycast address check
Trond Myklebust (1):
NFS: Fix memory leaks in nfs_pageio_stop_mirroring()
Tuomas Tynkkynen (1):
mac80211_hwsim: Use kstrndup() in place of kasprintf()
Vegard Nossum (1):
compiler.h: fix error in BUILD_BUG_ON() reporting
Vineeth Remanan Pillai (1):
xen-netfront: Rework the fix for Rx stall during OOM and network stress
Wen Yang (2):
ipmi: fix hung processes in __get_guid()
mtd: phram: fix a double free issue in error path
Xiao Yang (1):
tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
Xu Wang (1):
qlcnic: Fix bad kzalloc null test
Yang Xu (1):
KEYS: reaching the keys quotas correctly
YueHaibing (1):
misc: rtsx: set correct pcr_ops for rts522A
Zheng Wei (1):
net: vxge: fix wrong __VA_ARGS__ usage
zhangyi (F) (1):
jbd2: improve comments about freeing data buffers whose page mapping is NULL
이경택 (4):
ASoC: fix regwmask
ASoC: dapm: connect virtual mux with default value
ASoC: dpcm: allow start or stop during pause for backend
ASoC: topology: use name_prefix for new kcontrol
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 219 +SUBLEVEL = 220 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm64/kernel/armv8_deprecated.c +1 -1
@@ -605,7 +605,7 @@ static struct undef_hook setend_hooks[] = { }, {/* Thumb mode */ - .instr_mask = 0x0000fff7, + .instr_mask = 0xfffffff7, .instr_val = 0x0000b650, .pstate_mask = (COMPAT_PSR_T_BIT | COMPAT_PSR_MODE_MASK), .pstate_val = (COMPAT_PSR_T_BIT | COMPAT_PSR_MODE_USR),
arch/mips/cavium-octeon/octeon-irq.c +3 -0
@@ -2168,6 +2168,9 @@ static int octeon_irq_cib_map(struct irq_domain *d, } cd =kzalloc (sizeof (*cd),GFP_KERNEL ); +if (!cd) +return -ENOMEM ; + cd->host_data = host_data; cd->bit = hw;
arch/powerpc/kernel/signal_64.c +3 -1
@@ -462,8 +462,10 @@ static long restore_tm_sigcontexts(struct pt_regs *regs, err |=__get_user (current->thread.ckpt_regs.ccr, &sc->gp_regs[PT_CCR ]); +/* Don't allow userspace to set the trap value */ + regs->trap =0 ; +/* These regs are not checkpointed; they can go in 'regs'. */ - err |=__get_user (regs->trap, &sc->gp_regs[PT_TRAP ]); err |=__get_user (regs->dar, &sc->gp_regs[PT_DAR ]); err |=__get_user (regs->dsisr, &sc->gp_regs[PT_DSISR ]); err |=__get_user (regs->result, &sc->gp_regs[PT_RESULT ]);
arch/powerpc/mm/tlb_nohash_low.S +11 -1
@@ -400,7 +400,7 @@ _GLOBAL(set_context) * extern void loadcam_entry(unsigned int index) * * Load TLBCAM[index] entry in to the L2 CAM MMU - * Must preserve r7, r8, r9, and r10 + * Must preserve r7, r8, r9, r10 and r11 */ _GLOBAL(loadcam_entry) mflr r5
@@ -436,6 +436,10 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_BIG_PHYS) */ _GLOBAL(loadcam_multi) mflr r8 + /* Don't switch to AS=1 if already there */ + mfmsr r11 + andi. r11,r11,MSR_IS + bne 10f /* * Set up temporary TLB entry that is the same as what we're
@@ -461,6 +465,7 @@ _GLOBAL(loadcam_multi) mtmsr r6 isync +10: mr r9,r3 add r10,r3,r4 2: bl loadcam_entry
@@ -469,6 +474,10 @@ _GLOBAL(loadcam_multi) mr r3,r9 blt 2b + /* Don't return to AS=0 if we were in AS=1 at function start */ + andi. r11,r11,MSR_IS + bne 3f + /* Return to AS=0 and clear the temporary entry */ mfmsr r6 rlwinm. r6,r6,0,~(MSR_IS|MSR_DS)
@@ -484,6 +493,7 @@ _GLOBAL(loadcam_multi) tlbwe isync +3: mtlr r8 blr #endif
arch/s390/kernel/diag.c +1 -1
@@ -76,7 +76,7 @@ static int show_diag_stat(struct seq_file *m, void *v)static void *show_diag_stat_start (struct seq_file *m,loff_t *pos) { -return *pos <= nr_cpu_ids ? (void *)((unsigned long ) *pos +1 ) :NULL ; +return *pos <=NR_DIAG_STAT ? (void *)((unsigned long ) *pos +1 ) :NULL ; }static void *show_diag_stat_next (struct seq_file *m,void *v,loff_t *pos)
arch/x86/boot/compressed/head_32.S +1 -1
@@ -170,7 +170,7 @@ preferred_addr: notl %eax andl %eax, %ebx cmpl $LOAD_PHYSICAL_ADDR, %ebx - jge 1f + jae 1f #endif movl $LOAD_PHYSICAL_ADDR, %ebx 1:
arch/x86/boot/compressed/head_64.S +2 -2
@@ -104,7 +104,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx cmpl $LOAD_PHYSICAL_ADDR, %ebx - jge 1f + jae 1f #endif movl $LOAD_PHYSICAL_ADDR, %ebx 1:
@@ -337,7 +337,7 @@ preferred_addr: notq %rax andq %rax, %rbp cmpq $LOAD_PHYSICAL_ADDR, %rbp - jge 1f + jae 1f #endif movq $LOAD_PHYSICAL_ADDR, %rbp 1:
arch/x86/entry/entry_32.S +1 -0
@@ -1071,6 +1071,7 @@ ENTRY(int3) END(int3) ENTRY(general_protection) + ASM_CLAC pushl $do_general_protection jmp error_code END(general_protection)
arch/x86/entry/entry_64.S +2 -0
@@ -218,6 +218,8 @@ entry_SYSCALL_64_fastpath: testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */ + call mds_user_clear_buffers + movq RIP(%rsp), %rcx movq EFLAGS(%rsp), %r11 RESTORE_C_REGS_EXCEPT_RCX_R11
arch/x86/include/asm/microcode_intel.h +1 -1
@@ -60,7 +60,7 @@ static inline u32 intel_get_microcode_revision(void)native_wrmsrl (MSR_IA32_UCODE_REV ,0 );/* As documented in the SDM: Do a CPUID 1 here */ -sync_core (); +native_cpuid_eax (1 );/* get the current revision from MSR 0x8B */ native_rdmsr (MSR_IA32_UCODE_REV , dummy, rev);
arch/x86/include/asm/processor.h +18 -0
@@ -212,6 +212,24 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, : "memory"); } +#define native_cpuid_reg (reg) \ +static inline unsigned int native_cpuid_##reg(unsigned int op) \ +{ \ + unsigned int eax = op, ebx, ecx = 0, edx; \ + \ + native_cpuid(&eax, &ebx, &ecx, &edx); \ + \ + return reg; \ +} + +/* +* Native CPUID functions returning a single datum. +*/ +native_cpuid_reg (eax) +native_cpuid_reg (ebx ) +native_cpuid_reg (ecx) +native_cpuid_reg (edx) + static inline voidload_cr3 (pgd_t *pgdir) {write_cr3 (__pa (pgdir));
arch/x86/include/asm/spec-ctrl.h +2 -0
@@ -85,4 +85,6 @@ static inline void speculative_store_bypass_ht_init(void) { }extern void speculation_ctrl_update (unsigned long tif);extern void speculation_ctrl_update_current (void ); +extern void mds_user_clear_buffers (void ); +#endif
arch/x86/include/asm/vgtod.h +1 -1
@@ -86,7 +86,7 @@ static inline unsigned int __getcpu(void)* * If RDPID is available, use it. */ -alternative_io ("lsl %[p],%[seg]" , +alternative_io ("lsl %[seg],%[p]" ,".byte 0xf3,0x0f,0xc7,0xf8" ,/* RDPID %eax/rax */ X86_FEATURE_RDPID, [p] "=a" (p), [seg] "r" (__PER_CPU_SEG));
arch/x86/kernel/acpi/boot.c +1 -1
@@ -1708,7 +1708,7 @@ int __acpi_acquire_global_lock(unsigned int *lock) new = (((old & ~0x3 ) +2 ) + ((old >>1 ) &0x1 )); val =cmpxchg (lock, old, new); }while (unlikely (val != old)); -return (new <3 ) ?-1 :0 ; +return ((new &0x3 ) <3 ) ?-1 :0 ; }int __acpi_release_global_lock (unsigned int *lock)
arch/x86/kernel/cpu/bugs.c +5 -0
@@ -263,6 +263,11 @@ static int __init mds_cmdline(char *str) }early_param ("mds" , mds_cmdline); +void mds_user_clear_buffers (void ) +{ +mds_user_clear_cpu_buffers (); +} +#undef pr_fmt#define pr_fmt (fmt) "TAA: " fmt
arch/x86/kvm/cpuid.c +2 -1
@@ -457,7 +457,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, entry->edx |=F (SPEC_CTRL );if (boot_cpu_has (X86_FEATURE_STIBP )) entry->edx |=F (INTEL_STIBP ); -if (boot_cpu_has (X86_FEATURE_SSBD )) +if (boot_cpu_has (X86_FEATURE_SPEC_CTRL_SSBD ) || +boot_cpu_has (X86_FEATURE_AMD_SSBD )) entry->edx |=F (SPEC_CTRL_SSBD );/* * We emulate ARCH_CAPABILITIES in software even
arch/x86/kvm/x86.c +11 -0
@@ -7982,6 +7982,13 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, {int i; +/* +* Clear out the previous array pointers for the KVM_MR_MOVE case. The +* old arrays will be freed by __kvm_set_memory_region() if installing +* the new memslot is successful. +*/ +memset (&slot->arch,0 ,sizeof (slot->arch)); +for (i =0 ; i <KVM_NR_PAGE_SIZES ; ++i) {unsigned long ugfn;int lpages;
@@ -8050,6 +8057,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, const struct kvm_userspace_memory_region *mem, enum kvm_mr_change change) { + if (change == KVM_MR_MOVE) + return kvm_arch_create_memslot(kvm, memslot, + mem->memory_size >> PAGE_SHIFT); +return 0 ; }
drivers/ata/libata-pmp.c +1 -0
@@ -764,6 +764,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,if (dev->flags &ATA_DFLAG_DETACH ) { detach =1 ; + rc = -ENODEV ; goto fail; }
drivers/ata/libata-scsi.c +3 -6
@@ -3720,22 +3720,19 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)*/ shost->max_host_blocked =1 ; - rc =scsi_add_host_with_dma (ap->scsi_host, - &ap->tdev, ap->host->dev); + rc =scsi_add_host_with_dma (shost, &ap->tdev, ap->host->dev);if (rc) - goto err_add; + goto err_alloc; }return 0 ; - err_add: -scsi_host_put (host->ports[i]->scsi_host); err_alloc:while (--i >=0 ) {struct Scsi_Host *shost = host->ports[i]->scsi_host; +/* scsi_host_put() is in ata_devres_release() */ scsi_remove_host (shost); -scsi_host_put (shost); }return rc; }
drivers/bus/sunxi-rsb.c +1 -1
@@ -345,7 +345,7 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,if (ret) goto unlock; - *buf =readl (rsb->regs +RSB_DATA ); + *buf =readl (rsb->regs +RSB_DATA ) &GENMASK (len *8 -1 ,0 ); unlock:mutex_unlock (&rsb->lock);
drivers/char/ipmi/ipmi_msghandler.c +3 -1
@@ -2645,7 +2645,9 @@ get_guid(ipmi_smi_t intf)if (rv)/* Send failed, no GUID available. */ intf->bmc->guid_set =0 ; -wait_event (intf->waitq, intf->bmc->guid_set !=2 ); +else +wait_event (intf->waitq, intf->bmc->guid_set !=2 ); + intf->null_user_handler =NULL ; }
drivers/clk/at91/clk-usb.c +3 -0
@@ -79,6 +79,9 @@ static int at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, tmp_parent_rate = req->rate * div; tmp_parent_rate =clk_hw_round_rate (parent, tmp_parent_rate); +if (!tmp_parent_rate) +continue ; + tmp_rate =DIV_ROUND_CLOSEST (tmp_parent_rate, div);if (tmp_rate < req->rate) tmp_diff = req->rate - tmp_rate;
drivers/clk/tegra/clk-tegra-pmc.c +6 -6
@@ -60,16 +60,16 @@ struct pmc_clk_init_data {static DEFINE_SPINLOCK (clk_out_lock); -static const char *clk_out1_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern1" , +static const char *clk_out1_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern1" , }; -static const char *clk_out2_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern2" , +static const char *clk_out2_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern2" , }; -static const char *clk_out3_parents[] = {"clk_m" ,"clk_m_div2" , -"clk_m_div4" ,"extern3" , +static const char *clk_out3_parents[] = {"osc" ,"osc_div2" , +"osc_div4" ,"extern3" , };static struct pmc_clk_init_data pmc_clks[] = {
drivers/crypto/mxs-dcp.c +28 -30
83 lines not on this page · raw message
drivers/gpu/drm/drm_dp_mst_topology.c +11 -4
@@ -1036,10 +1036,12 @@ static bool drm_dp_port_setup_pdt(struct drm_dp_mst_port *port) lct =drm_dp_calculate_rad (port, rad); port->mstb =drm_dp_add_mst_branch_device (lct, rad); - port->mstb->mgr = port->mgr; - port->mstb->port_parent = port; +if (port->mstb) { + port->mstb->mgr = port->mgr; + port->mstb->port_parent = port; - send_link = true; + send_link = true; + }break ; }return send_link;
@@ -2031,6 +2033,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool msint ret =0 ;struct drm_dp_mst_branch *mstb =NULL ; +mutex_lock (&mgr->payload_lock);mutex_lock (&mgr->lock);if (mst_state == mgr->mst_state) goto out_unlock;
@@ -2093,7 +2096,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms/* this can fail if the device is gone */ drm_dp_dpcd_writeb (mgr->aux,DP_MSTM_CTRL ,0 ); ret =0 ; -memset (mgr->payloads,0 , mgr->max_payloads *sizeof (struct drm_dp_payload )); +memset (mgr->payloads,0 , + mgr->max_payloads *sizeof (mgr->payloads[0 ])); +memset (mgr->proposed_vcpis,0 , + mgr->max_payloads *sizeof (mgr->proposed_vcpis[0 ])); mgr->payload_mask =0 ;set_bit (0 , &mgr->payload_mask); mgr->vcpi_mask =0 ;
@@ -2101,6 +2107,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms out_unlock:mutex_unlock (&mgr->lock); +mutex_unlock (&mgr->payload_lock);if (mstb)drm_dp_put_mst_branch_device (mstb);return ret;
drivers/i2c/busses/i2c-st.c +1 -0
@@ -399,6 +399,7 @@ static void st_i2c_wr_fill_tx_fifo(struct st_i2c_dev *i2c_dev)/** * st_i2c_rd_fill_tx_fifo() - Fill the Tx FIFO in read mode * @i2c_dev: Controller's private data +* @max: Maximum amount of data to fill into the Tx FIFO * * This functions fills the Tx FIFO with fixed pattern when * in read mode to trigger clock.
drivers/infiniband/ulp/ipoib/ipoib_ib.c +3 -4
@@ -1057,13 +1057,10 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,ipoib_ib_dev_down (dev);if (level ==IPOIB_FLUSH_HEAVY ) { -rtnl_lock ();if (test_bit (IPOIB_FLAG_INITIALIZED , &priv->flags))ipoib_ib_dev_stop (dev); - result =ipoib_ib_dev_open (dev); -rtnl_unlock (); -if (result) +if (ipoib_ib_dev_open (dev))return ;if (netif_queue_stopped (dev))
@@ -1102,7 +1099,9 @@ void ipoib_ib_dev_flush_heavy(struct work_struct *work)struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, flush_heavy); +rtnl_lock ();__ipoib_ib_dev_flush (priv,IPOIB_FLUSH_HEAVY ,0 ); +rtnl_unlock (); }void ipoib_ib_dev_cleanup (struct net_device *dev)
drivers/input/serio/i8042-x86ia64io.h +11 -0
@@ -534,6 +534,17 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), }, }, + { + /* + * Acer Aspire 5738z + * Touchpad stops working in mux mode when dis- + re-enabled + * with the touchpad enable/disable toggle hotkey + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), + }, + }, { } };
drivers/iommu/amd_iommu_types.h +1 -1
@@ -303,7 +303,7 @@#define DTE_GCR3_VAL_A (x) (((x) >> 12) & 0x00007ULL)#define DTE_GCR3_VAL_B (x) (((x) >> 15) & 0x0ffffULL) -#define DTE_GCR3_VAL_C (x) (((x) >> 31) & 0xfffffULL) +#define DTE_GCR3_VAL_C (x) (((x) >> 31) & 0x1fffffULL)#define DTE_GCR3_INDEX_A 0#define DTE_GCR3_INDEX_B 1
drivers/irqchip/irq-versatile-fpga.c +13 -5
@@ -5,6 +5,7 @@#include <linux/irq.h> #include <linux/io.h> #include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> #include <linux/irqchip/versatile-fpga.h> #include <linux/irqdomain.h> #include <linux/module.h>
@@ -67,12 +68,16 @@ static void fpga_irq_unmask(struct irq_data *d)static void fpga_irq_handle (struct irq_desc *desc) { +struct irq_chip *chip =irq_desc_get_chip (desc);struct fpga_irq_data *f =irq_desc_get_handler_data (desc); -u32 status =readl (f->base +IRQ_STATUS ); +u32 status; + +chained_irq_enter (chip, desc); + status =readl (f->base +IRQ_STATUS );if (status ==0 ) {do_bad_IRQ (desc); -return ; + goto out; } do {
@@ -81,6 +86,9 @@ static void fpga_irq_handle(struct irq_desc *desc) status &= ~(1 << irq);generic_handle_irq (irq_find_mapping (f->domain, irq)); }while (status); + +out: +chained_irq_exit (chip, desc); }/*
@@ -203,6 +211,9 @@ int __init fpga_irq_of_init(struct device_node *node,if (of_property_read_u32 (node,"valid-mask" , &valid_mask)) valid_mask =0 ; +writel (clear_mask, base +IRQ_ENABLE_CLEAR ); +writel (clear_mask, base +FIQ_ENABLE_CLEAR ); +/* Some chips are cascaded from a parent IRQ */ parent_irq =irq_of_parse_and_map (node,0 );if (!parent_irq) {
@@ -217,9 +228,6 @@ int __init fpga_irq_of_init(struct device_node *node,fpga_irq_init (base, node->name,0 , parent_irq, valid_mask, node);#endif -writel (clear_mask, base +IRQ_ENABLE_CLEAR ); -writel (clear_mask, base +FIQ_ENABLE_CLEAR ); -/* * On Versatile AB/PB, some secondary interrupts have a direct * pass-thru to the primary controller for IRQs 20 and 22-31 which need
drivers/md/dm-flakey.c +5 -0
@@ -69,6 +69,11 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, arg_name =dm_shift_arg (as); argc--; +if (!arg_name) { + ti->error ="Insufficient feature arguments" ; +return -EINVAL ; + } +/* * drop_writes */
drivers/mfd/dln2.c +7 -2
@@ -93,6 +93,11 @@ struct dln2_mod_rx_slots {spinlock_t lock; }; +enum dln2_endpoint { +DLN2_EP_OUT =0 , +DLN2_EP_IN =1 , +}; +struct dln2_dev {struct usb_device *usb_dev;struct usb_interface *interface;
@@ -740,10 +745,10 @@ static int dln2_probe(struct usb_interface *interface, hostif->desc.bNumEndpoints < 2)return -ENODEV ; - epin = &hostif->endpoint[0 ].desc; - epout = &hostif->endpoint[1 ].desc; + epout = &hostif->endpoint[DLN2_EP_OUT ].desc;if (!usb_endpoint_is_bulk_out (epout))return -ENODEV ; + epin = &hostif->endpoint[DLN2_EP_IN ].desc;if (!usb_endpoint_is_bulk_in (epin))return -ENODEV ;
drivers/mfd/rts5227.c +1 -0
@@ -369,6 +369,7 @@ static const struct pcr_ops rts522a_pcr_ops = {void rts522a_init_params (struct rtsx_pcr *pcr) {rts5227_init_params (pcr); + pcr->ops = &rts522a_pcr_ops; pcr->reg_pm_ctrl3 =RTS522A_PM_CTRL3 ; }
drivers/misc/echo/echo.c +1 -1
@@ -454,7 +454,7 @@ int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx)*/ ec->factor =0 ; ec->shift =0 ; -if ((ec->nonupdate_dwell ==0 )) { +if (!ec->nonupdate_dwell) {int p, logp, shift;/* Determine:
drivers/mtd/devices/phram.c +9 -6
@@ -247,22 +247,25 @@ static int phram_setup(const char *val) ret =parse_num64 (&start, token[1 ]);if (ret) { -kfree (name);parse_err ("illegal start address\n" ); + goto error; } ret =parse_num64 (&len, token[2 ]);if (ret) { -kfree (name);parse_err ("illegal device length\n" ); + goto error; } ret =register_device (name, start, len); -if (!ret) -pr_info ("%s device: %#llx at %#llx\n" , name, len, start); -else -kfree (name); +if (ret) + goto error; + +pr_info ("%s device: %#llx at %#llx\n" , name, len, start); +return 0 ; +error: +kfree (name);return ret; }
drivers/mtd/lpddr/lpddr_cmds.c +0 -1
@@ -81,7 +81,6 @@ struct mtd_info *lpddr_cmdset(struct map_info *map) shared =kmalloc (sizeof (struct flchip_shared ) * lpddr->numchips,GFP_KERNEL );if (!shared) { -kfree (lpddr);kfree (mtd);return NULL ; }
drivers/net/ethernet/neterion/vxge/vxge-config.h +1 -1
@@ -2065,7 +2065,7 @@ vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask);if ((level >=VXGE_ERR &&VXGE_COMPONENT_LL &VXGE_DEBUG_ERR_MASK ) || \ (level >=VXGE_TRACE &&VXGE_COMPONENT_LL &VXGE_DEBUG_TRACE_MASK ))\if ((mask &VXGE_DEBUG_MASK ) == mask) \ -printk (fmt"\n" , __VA_ARGS__); \ + printk(fmt "\n", ##__VA_ARGS__); \ } while (0) #else#define vxge_debug_ll (level, mask, fmt, ...)
drivers/net/ethernet/neterion/vxge/vxge-main.h +7 -7
@@ -454,49 +454,49 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);#if (VXGE_DEBUG_LL_CONFIG &VXGE_DEBUG_MASK )#define vxge_debug_ll_config (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, ##__VA_ARGS__)#else #define vxge_debug_ll_config (level, fmt, ...)#endif #if (VXGE_DEBUG_INIT &VXGE_DEBUG_MASK )#define vxge_debug_init (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, ##__VA_ARGS__)#else #define vxge_debug_init (level, fmt, ...)#endif #if (VXGE_DEBUG_TX &VXGE_DEBUG_MASK )#define vxge_debug_tx (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, ##__VA_ARGS__)#else #define vxge_debug_tx (level, fmt, ...)#endif #if (VXGE_DEBUG_RX &VXGE_DEBUG_MASK )#define vxge_debug_rx (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, ##__VA_ARGS__)#else #define vxge_debug_rx (level, fmt, ...)#endif #if (VXGE_DEBUG_MEM &VXGE_DEBUG_MASK )#define vxge_debug_mem (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, ##__VA_ARGS__)#else #define vxge_debug_mem (level, fmt, ...)#endif #if (VXGE_DEBUG_ENTRYEXIT &VXGE_DEBUG_MASK )#define vxge_debug_entryexit (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, ##__VA_ARGS__)#else #define vxge_debug_entryexit (level, fmt, ...)#endif #if (VXGE_DEBUG_INTR &VXGE_DEBUG_MASK )#define vxge_debug_intr (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, ##__VA_ARGS__)#else #define vxge_debug_intr (level, fmt, ...)#endif
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +1 -1
@@ -1724,7 +1724,7 @@ static int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *p_d ahw->reset.seq_error =0 ; ahw->reset.buff =kzalloc (QLC_83XX_RESTART_TEMPLATE_SIZE ,GFP_KERNEL ); -if (p_dev->ahw->reset.buff ==NULL ) +if (ahw->reset.buff ==NULL )return -ENOMEM ; p_buff = p_dev->ahw->reset.buff;
drivers/net/wireless/ath/ath9k/main.c +3 -0
@@ -1437,6 +1437,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)ath_chanctx_set_channel (sc, ctx, &hw->conf.chandef); } +if (changed &IEEE80211_CONF_CHANGE_POWER ) +ath9k_set_txpower (sc,NULL ); +mutex_unlock (&sc->mutex);ath9k_ps_restore (sc);
drivers/net/wireless/ath/wil6210/debugfs.c +4 -3
@@ -1088,7 +1088,7 @@ static const struct file_operations fops_ssid = { };/*---------temp------------*/ -static void print_temp (struct seq_file *s,const char *prefix,u32 t) +static void print_temp (struct seq_file *s,const char *prefix,s32 t) {switch (t) {case 0 :
@@ -1096,7 +1096,8 @@ static void print_temp(struct seq_file *s, const char *prefix, u32 t)seq_printf (s,"%s N/A\n" , prefix);break ;default : -seq_printf (s,"%s %d.%03d\n" , prefix, t /1000 , t %1000 ); +seq_printf (s,"%s %s%d.%03d\n" , prefix, (t <0 ?"-" :"" ), +abs (t /1000 ),abs (t %1000 ));break ; } }
@@ -1104,7 +1105,7 @@ static void print_temp(struct seq_file *s, const char *prefix, u32 t)static int wil_temp_debugfs_show (struct seq_file *s,void *data) {struct wil6210_priv *wil = s->private; -u32 t_m, t_r; +s32 t_m, t_r;int rc =wmi_get_temperature (wil, &t_m, &t_r);if (rc) {
drivers/net/wireless/ath/wil6210/main.c +1 -1
@@ -741,7 +741,7 @@ static void wil_bl_crash_info(struct wil6210_priv *wil, bool is_err)static int wil_wait_for_fw_ready (struct wil6210_priv *wil) { -ulong to =msecs_to_jiffies (1000 ); +ulong to =msecs_to_jiffies (2000 );ulong left =wait_for_completion_timeout (&wil->wmi_ready, to);if (0 == left) {
drivers/net/wireless/ath/wil6210/txrx.c +2 -2
@@ -538,8 +538,8 @@ static int wil_rx_refill(struct wil6210_priv *wil, int count) v->swtail = next_tail) { rc =wil_vring_alloc_skb (wil, v, v->swtail, headroom);if (unlikely (rc)) { -wil_err (wil,"Error %d in wil_rx_refill[%d]\n" , - rc, v->swtail); +wil_err_ratelimited (wil,"Error %d in rx refill[%d]\n" , + rc, v->swtail);break ; } }
drivers/net/wireless/mac80211_hwsim.c +6 -6
@@ -2901,9 +2901,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) param.no_vif = true;if (info->attrs[HWSIM_ATTR_RADIO_NAME ]) { - hwname =kasprintf (GFP_KERNEL ,"%.*s" , -nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), - (char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ])); + hwname =kstrndup ((char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +GFP_KERNEL );if (!hwname)return -ENOMEM ; param.hwname = hwname;
@@ -2942,9 +2942,9 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)if (info->attrs[HWSIM_ATTR_RADIO_ID ]) { idx =nla_get_u32 (info->attrs[HWSIM_ATTR_RADIO_ID ]); }else if (info->attrs[HWSIM_ATTR_RADIO_NAME ]) { - hwname =kasprintf (GFP_KERNEL ,"%.*s" , -nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), - (char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ])); + hwname =kstrndup ((char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +GFP_KERNEL );if (!hwname)return -ENOMEM ; }else
drivers/net/xen-netfront.c +11 -3
@@ -283,6 +283,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue) {RING_IDX req_prod = queue->rx.req_prod_pvt;int notify; +int err =0 ;if (unlikely (!netif_carrier_ok (queue->info->netdev)))return ;
@@ -297,8 +298,10 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)struct xen_netif_rx_request *req; skb =xennet_alloc_one_rx_buffer (queue); -if (!skb) +if (!skb) { + err = -ENOMEM ;break ; + } id =xennet_rxidx (req_prod);
@@ -322,8 +325,13 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue) queue->rx.req_prod_pvt = req_prod; -/* Not enough requests? Try again later. */ -if (req_prod - queue->rx.sring->req_prod <NET_RX_SLOTS_MIN ) { +/* Try again later if there are not enough requests or skb allocation +* failed. +* Enough requests is quantified as the sum of newly created slots and +* the unconsumed slots at the backend. +*/ +if (req_prod - queue->rx.rsp_cons <NET_RX_SLOTS_MIN || +unlikely (err)) {mod_timer (&queue->rx_refill_timer, jiffies + (HZ /10 ));return ; }
drivers/of/base.c +0 -3
@@ -167,9 +167,6 @@ int __of_attach_node_sysfs(struct device_node *np)struct property *pp;int rc; -if (!IS_ENABLED (CONFIG_SYSFS )) -return 0 ; -if (!of_kset)return 0 ;
drivers/of/unittest.c +5 -2
@@ -812,10 +812,13 @@ static void __init of_unittest_platform_populate(void)of_platform_populate (np, match,NULL , &test_bus->dev);for_each_child_of_node (np, child) { -for_each_child_of_node (child, grandchild) -unittest (of_find_device_by_node (grandchild), +for_each_child_of_node (child, grandchild) { + pdev =of_find_device_by_node (grandchild); +unittest (pdev,"Could not create device for node '%s'\n" , grandchild->name); +of_dev_put (pdev); + } }of_platform_depopulate (&test_bus->dev);
drivers/rtc/rtc-pm8xxx.c +38 -11
88 lines not on this page · raw message
drivers/s390/scsi/zfcp_erp.c +1 -1
@@ -747,7 +747,7 @@ static void zfcp_erp_enqueue_ptp_port(struct zfcp_adapter *adapter) adapter->peer_d_id);if (IS_ERR (port))/* error or port already attached */ return ; -_zfcp_erp_port_reopen (port,0 ,"ereptp1" ); +zfcp_erp_port_reopen (port,0 ,"ereptp1" ); }static int zfcp_erp_adapter_strat_fsf_xconf (struct zfcp_erp_action *erp_action)
drivers/scsi/sg.c +3 -1
@@ -820,8 +820,10 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,"sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n" , (int) cmnd[0], (int) hp->cmd_len)); -if (hp->dxfer_len >=SZ_256M ) +if (hp->dxfer_len >=SZ_256M ) { +sg_remove_request (sfp, srp);return -EINVAL ; + } k =sg_start_req (srp, cmnd);if (k) {
drivers/scsi/ufs/ufs-qcom.c +1 -1
@@ -1032,7 +1032,7 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba) hba->quirks |=UFSHCD_QUIRK_BROKEN_LCC ; } -if (host->hw_ver.major >=0x2 ) { +if (host->hw_ver.major ==0x2 ) { hba->quirks |=UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION ;if (!ufs_qcom_cap_qunipro (host))
drivers/scsi/ufs/ufshcd.c +5 -0
@@ -595,6 +595,11 @@ start:*/ if (ufshcd_can_hibern8_during_gating (hba) &&ufshcd_is_link_hibern8 (hba)) { +if (async) { + rc = -EAGAIN ; + hba->clk_gating.active_reqs--; +break ; + }spin_unlock_irqrestore (hba->host->host_lock, flags);flush_work (&hba->clk_gating.ungate_work);spin_lock_irqsave (hba->host->host_lock, flags);
drivers/soc/qcom/smem.c +1 -1
@@ -646,7 +646,7 @@ static int qcom_smem_enumerate_partitions(struct qcom_smem *smem,return -EINVAL ; } -if (header->size != entry->size) { +if (le32_to_cpu (header->size) !=le32_to_cpu (entry->size)) {dev_err (smem->dev,"Partition %d has invalid size\n" , i);return -EINVAL ;
drivers/tty/ehv_bytechan.c +18 -3
@@ -140,6 +140,21 @@ static int find_console_handle(void)return 1 ; } +static unsigned int local_ev_byte_channel_send (unsigned int handle, +unsigned int *count, +const char *p) +{ +char buffer[EV_BYTE_CHANNEL_MAX_BYTES ]; +unsigned int c = *count; + +if (c <sizeof (buffer)) { +memcpy (buffer, p, c); +memset (&buffer[c],0 ,sizeof (buffer) - c); + p = buffer; + } +return ev_byte_channel_send (handle, count, p); +} +/*************************** EARLY CONSOLE DRIVER ***************************/ #ifdef CONFIG_PPC_EARLY_DEBUG_EHV_BC
@@ -158,7 +173,7 @@ static void byte_channel_spin_send(const char data)do { count =1 ; - ret =ev_byte_channel_send (CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE , + ret =local_ev_byte_channel_send (CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE , &count, &data); }while (ret ==EV_EAGAIN ); }
@@ -225,7 +240,7 @@ static int ehv_bc_console_byte_channel_send(unsigned int handle, const char *s,while (count) { len = min_t(unsigned int, count, EV_BYTE_CHANNEL_MAX_BYTES);do { - ret =ev_byte_channel_send (handle, &len, s); + ret =local_ev_byte_channel_send (handle, &len, s); }while (ret ==EV_EAGAIN ); count -= len; s += len;
@@ -405,7 +420,7 @@ static void ehv_bc_tx_dequeue(struct ehv_bc_data *bc)CIRC_CNT_TO_END (bc->head, bc->tail,BUF_SIZE ), EV_BYTE_CHANNEL_MAX_BYTES); - ret =ev_byte_channel_send (bc->handle, &len, bc->buf + bc->tail); + ret =local_ev_byte_channel_send (bc->handle, &len, bc->buf + bc->tail);/* 'len' is valid only if the return code is 0 or EV_EAGAIN */ if (!ret || (ret ==EV_EAGAIN ))
drivers/usb/gadget/composite.c +9 -0
@@ -744,6 +744,11 @@ static int set_config(struct usb_composite_dev *cdev,/* when we return, be sure our power usage is valid */ power = c->MaxPower ? c->MaxPower :CONFIG_USB_GADGET_VBUS_DRAW ; done: +if (power <=USB_SELF_POWER_VBUS_MAX_DRAW ) +usb_gadget_set_selfpowered (gadget); +else +usb_gadget_clear_selfpowered (gadget); +usb_gadget_vbus_draw (gadget, power);if (result >=0 && cdev->delayed_status) result =USB_GADGET_DELAYED_STATUS ;
@@ -2156,6 +2161,7 @@ void composite_suspend(struct usb_gadget *gadget) cdev->suspended =1 ; +usb_gadget_set_selfpowered (gadget);usb_gadget_vbus_draw (gadget,2 ); }
@@ -2179,6 +2185,9 @@ void composite_resume(struct usb_gadget *gadget) maxpower = cdev->config->MaxPower; +if (maxpower >USB_SELF_POWER_VBUS_MAX_DRAW ) +usb_gadget_clear_selfpowered (gadget); +usb_gadget_vbus_draw (gadget, maxpower ? maxpower :CONFIG_USB_GADGET_VBUS_DRAW ); }
drivers/usb/gadget/function/f_fs.c +1 -0
@@ -812,6 +812,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) ret =usb_ep_queue (ep->ep, req,GFP_ATOMIC );if (unlikely (ret)) { + io_data->req =NULL ;usb_ep_free_request (ep->ep, req); goto error_lock; }
drivers/video/fbdev/core/fbmem.c +1 -1
@@ -1132,7 +1132,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,case FBIOGET_FSCREENINFO :if (!lock_fb_info (info))return -ENODEV ; - fix = info->fix; +memcpy (&fix, &info->fix,sizeof (fix));unlock_fb_info (info); ret =copy_to_user (argp, &fix,sizeof (fix)) ? -EFAULT :0 ;
drivers/video/fbdev/sis/init301.c +1 -3
@@ -522,9 +522,7 @@ SiS_PanelDelay(struct SiS_Private *SiS_Pr, unsigned short DelayTime)SiS_DDC2Delay (SiS_Pr,0x4000 ); } - }else if ((SiS_Pr->SiS_IF_DEF_LVDS ==1 )/* || -(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) || -(SiS_Pr->SiS_CustomT == CUT_CLEVO1400) */ ) {/* 315 series, LVDS; Special */ + }else if (SiS_Pr->SiS_IF_DEF_LVDS ==1 ) {/* 315 series, LVDS; Special */ if (SiS_Pr->SiS_IF_DEF_CH70xx ==0 ) { PanelID =SiS_GetReg (SiS_Pr->SiS_P3d4,0x36 );
fs/btrfs/async-thread.c +8 -0
@@ -389,3 +389,11 @@ void btrfs_set_work_high_priority(struct btrfs_work *work) {set_bit (WORK_HIGH_PRIO_BIT , &work->flags); } + +void btrfs_flush_workqueue (struct btrfs_workqueue *wq) +{ +if (wq->high) +flush_workqueue (wq->high->normal_wq); + +flush_workqueue (wq->normal->normal_wq); +}
fs/btrfs/async-thread.h +2 -0
@@ -81,4 +81,6 @@ void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);void btrfs_workqueue_set_max (struct btrfs_workqueue *wq,int max);void btrfs_set_work_high_priority (struct btrfs_work *work);bool btrfs_workqueue_normal_congested (struct btrfs_workqueue *wq); +void btrfs_flush_workqueue (struct btrfs_workqueue *wq); +#endif
fs/btrfs/disk-io.c +13 -0
@@ -3774,6 +3774,19 @@ void close_ctree(struct btrfs_root *root)*/ btrfs_delete_unused_bgs (root->fs_info); +/* +* There might be existing delayed inode workers still running +* and holding an empty delayed inode item. We must wait for +* them to complete first because they can create a transaction. +* This happens when someone calls btrfs_balance_delayed_items() +* and then a transaction commit runs the same delayed nodes +* before any delayed worker has done something with the nodes. +* We must wait for any worker here and not at transaction +* commit time since that could cause a deadlock. +* This is a very rare case. +*/ +btrfs_flush_workqueue (fs_info->delayed_workers); + ret =btrfs_commit_super (root);if (ret)btrfs_err (fs_info,"commit super ret %d" , ret);
fs/btrfs/relocation.c +22 -11
@@ -1289,7 +1289,7 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)if (!node)return -ENOMEM ; - node->bytenr = root->node->start; + node->bytenr = root->commit_root->start; node->data = root;spin_lock (&rc->reloc_root_tree.lock);
@@ -1321,10 +1321,11 @@ static void __del_reloc_root(struct btrfs_root *root)if (rc && root->node) {spin_lock (&rc->reloc_root_tree.lock); rb_node =tree_search (&rc->reloc_root_tree.rb_root, - root->node->start); + root->commit_root->start);if (rb_node) { node = rb_entry(rb_node, struct mapping_node, rb_node);rb_erase (&node->rb_node, &rc->reloc_root_tree.rb_root); +RB_CLEAR_NODE (&node->rb_node); }spin_unlock (&rc->reloc_root_tree.lock);if (!node)
@@ -1342,7 +1343,7 @@ static void __del_reloc_root(struct btrfs_root *root)* helper to update the 'address of tree root -> reloc tree' * mapping */ -static int __update_reloc_root (struct btrfs_root *root,u64 new_bytenr) +static int __update_reloc_root (struct btrfs_root *root) {struct rb_node *rb_node;struct mapping_node *node =NULL ;
@@ -1350,7 +1351,7 @@ static int __update_reloc_root(struct btrfs_root *root, u64 new_bytenr)spin_lock (&rc->reloc_root_tree.lock); rb_node =tree_search (&rc->reloc_root_tree.rb_root, - root->node->start); + root->commit_root->start);if (rb_node) { node = rb_entry(rb_node, struct mapping_node, rb_node);rb_erase (&node->rb_node, &rc->reloc_root_tree.rb_root);
@@ -1362,7 +1363,7 @@ static int __update_reloc_root(struct btrfs_root *root, u64 new_bytenr)BUG_ON ((struct btrfs_root *)node->data != root);spin_lock (&rc->reloc_root_tree.lock); - node->bytenr = new_bytenr; + node->bytenr = root->node->start; rb_node =tree_insert (&rc->reloc_root_tree.rb_root, node->bytenr, &node->rb_node);spin_unlock (&rc->reloc_root_tree.lock);
@@ -1503,6 +1504,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, }if (reloc_root->commit_root != reloc_root->node) { +__update_reloc_root (reloc_root);btrfs_set_root_node (root_item, reloc_root->node);free_extent_buffer (reloc_root->commit_root); reloc_root->commit_root =btrfs_root_node (reloc_root);
@@ -2440,7 +2442,21 @@ out:free_reloc_roots (&reloc_roots); } -BUG_ON (!RB_EMPTY_ROOT (&rc->reloc_root_tree.rb_root)); +/* +* We used to have +* +* BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root)); +* +* here, but it's wrong. If we fail to start the transaction in +* prepare_to_merge() we will have only 0 ref reloc roots, none of which +* have actually been removed from the reloc_root_tree rb tree. This is +* fine because we're bailing here, and we hold a reference on the root +* for the list that holds it, so these roots will be cleaned up when we +* do the reloc_dirty_list afterwards. Meanwhile the root->reloc_root +* will be cleaned up on unmount. +* +* The remaining nodes will be cleaned up by free_reloc_control. +*/ }static void free_block_list (struct rb_root *blocks)
@@ -4564,11 +4580,6 @@ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,BUG_ON (rc->stage ==UPDATE_DATA_PTRS && root->root_key.objectid ==BTRFS_DATA_RELOC_TREE_OBJECTID ); -if (root->root_key.objectid ==BTRFS_TREE_RELOC_OBJECTID ) { -if (buf == root->node) -__update_reloc_root (root, cow->start); - } - level =btrfs_header_level (buf);if (btrfs_header_generation (buf) <=btrfs_root_last_snapshot (&root->root_item))
fs/btrfs/send.c +4 -3
@@ -5022,15 +5022,12 @@ static int is_extent_unchanged(struct send_ctx *sctx, goto out; } - right_disknr =btrfs_file_extent_disk_bytenr (eb, ei);if (right_type ==BTRFS_FILE_EXTENT_INLINE ) { right_len =btrfs_file_extent_inline_len (eb, slot, ei); right_len =PAGE_ALIGN (right_len); }else { right_len =btrfs_file_extent_num_bytes (eb, ei); } - right_offset =btrfs_file_extent_offset (eb, ei); - right_gen =btrfs_file_extent_generation (eb, ei);/* * Are we at extent 8? If yes, we know the extent is changed.
@@ -5055,6 +5052,10 @@ static int is_extent_unchanged(struct send_ctx *sctx, goto out; } + right_disknr =btrfs_file_extent_disk_bytenr (eb, ei); + right_offset =btrfs_file_extent_offset (eb, ei); + right_gen =btrfs_file_extent_generation (eb, ei); + left_offset_fixed = left_offset;if (key.offset < ekey->offset) {/* Fix the right offset for 2a and 7. */
fs/exec.c +1 -1
@@ -1207,7 +1207,7 @@ void setup_new_exec(struct linux_binprm * bprm)/* An exec changes our domain. We are no longer part of the thread group */ - current->self_exec_id++; +WRITE_ONCE (current->self_exec_id, current->self_exec_id +1 );flush_signal_handlers (current,0 ); }EXPORT_SYMBOL (setup_new_exec);
fs/ext2/xattr.c +3 -2
@@ -55,6 +55,7 @@#include <linux/buffer_head.h> #include <linux/init.h> +#include <linux/printk.h> #include <linux/slab.h> #include <linux/mbcache.h> #include <linux/quotaops.h>
@@ -85,8 +86,8 @@printk ("\n" ); \ } while (0) #else -# define ea_idebug(f...) -# define ea_bdebug(f...) +# define ea_idebug(inode, f...) no_printk(f) +# define ea_bdebug(bh, f...) no_printk(f)#endif static int ext2_xattr_set2(struct inode *, struct buffer_head *,
fs/ext4/extents.c +4 -4
@@ -3439,8 +3439,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, (unsigned long long)map->m_lblk, map_len); sbi =EXT4_SB (inode->i_sb); - eof_block = (inode->i_size + inode->i_sb->s_blocksize -1 ) >> - inode->i_sb->s_blocksize_bits; + eof_block = (EXT4_I (inode)->i_disksize + inode->i_sb->s_blocksize -1 ) + >> inode->i_sb->s_blocksize_bits;if (eof_block < map->m_lblk + map_len) eof_block = map->m_lblk + map_len;
@@ -3701,8 +3701,8 @@ static int ext4_split_convert_extents(handle_t *handle, __func__, inode->i_ino, (unsigned long long)map->m_lblk, map->m_len); - eof_block = (inode->i_size + inode->i_sb->s_blocksize -1 ) >> - inode->i_sb->s_blocksize_bits; + eof_block = (EXT4_I (inode)->i_disksize + inode->i_sb->s_blocksize -1 ) + >> inode->i_sb->s_blocksize_bits;if (eof_block < map->m_lblk + map->m_len) eof_block = map->m_lblk + map->m_len;/*
fs/ext4/inode.c +1 -1
@@ -4485,7 +4485,7 @@ static int ext4_inode_blocks_set(handle_t *handle, struct ext4_inode_info *ei) {struct inode *inode = &(ei->vfs_inode); -u64 i_blocks = inode->i_blocks; +u64 i_blocks =READ_ONCE (inode->i_blocks);struct super_block *sb = inode->i_sb;if (i_blocks <= ~0U ) {
fs/ext4/super.c +5 -4
@@ -313,7 +313,8 @@ static void save_error_info(struct super_block *sb, const char *func, unsigned int line) {__save_error_info (sb, func, line); -ext4_commit_super (sb,1 ); +if (!bdev_read_only (sb->s_bdev)) +ext4_commit_super (sb,1 ); }/*
@@ -3660,7 +3661,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || sbi->s_inodes_per_group > blocksize *8 ) {ext4_msg (sb,KERN_ERR ,"invalid inodes per group: %lu\n" , - sbi->s_blocks_per_group); + sbi->s_inodes_per_group); goto failed_mount; } sbi->s_itb_per_group = sbi->s_inodes_per_group /
@@ -3791,9 +3792,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) EXT4_BLOCKS_PER_GROUP(sb) - 1);do_div (blocks_count,EXT4_BLOCKS_PER_GROUP (sb));if (blocks_count > ((uint64_t )1 <<32 ) -EXT4_DESC_PER_BLOCK (sb)) { -ext4_msg (sb,KERN_WARNING ,"groups count too large: %u " +ext4_msg (sb,KERN_WARNING ,"groups count too large: %llu " "(block count %llu, first data block %u, " -"blocks per group %lu)" , sbi->s_groups_count, +"blocks per group %lu)" , blocks_count,ext4_blocks_count (es),le32_to_cpu (es->s_first_data_block),EXT4_BLOCKS_PER_GROUP (sb));
fs/gfs2/glock.c +3 -0
@@ -541,6 +541,9 @@ __acquires(&gl->gl_lockref.lock) goto out_unlock;if (nonblock) goto out_sched; +smp_mb (); +if (atomic_read (&gl->gl_revokes) !=0 ) + goto out_sched;set_bit (GLF_DEMOTE_IN_PROGRESS , &gl->gl_flags);GLOCK_BUG_ON (gl, gl->gl_demote_state ==LM_ST_EXCLUSIVE ); gl->gl_target = gl->gl_demote_state;
fs/hfsplus/attributes.c +4 -0
@@ -291,6 +291,10 @@ static int __hfsplus_delete_attr(struct inode *inode, u32 cnid,return -ENOENT ; } +/* Avoid btree corruption */ +hfs_bnode_read (fd->bnode, fd->search_key, + fd->keyoffset, fd->keylength); + err =hfs_brec_remove (fd);if (err)return err;
fs/jbd2/commit.c +4 -3
@@ -1008,9 +1008,10 @@ restart_loop:* journalled data) we need to unmap buffer and clear * more bits. We also need to be careful about the check * because the data page mapping can get cleared under -* out hands, which alse need not to clear more bits -* because the page and buffers will be freed and can -* never be reused once we are done with them. +* our hands. Note that if mapping == NULL, we don't +* need to make buffer unmapped because the page is +* already detached from the mapping and buffers cannot +* get reused. */ mapping =READ_ONCE (bh->b_page->mapping);if (mapping && !sb_is_blkdev_sb (mapping->host->i_sb)) {
fs/nfs/direct.c +2 -0
@@ -605,6 +605,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter, l_ctx =nfs_get_lock_context (dreq->ctx);if (IS_ERR (l_ctx)) { result =PTR_ERR (l_ctx); +nfs_direct_req_release (dreq); goto out_release; } dreq->l_ctx = l_ctx;
@@ -1015,6 +1016,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) l_ctx =nfs_get_lock_context (dreq->ctx);if (IS_ERR (l_ctx)) { result =PTR_ERR (l_ctx); +nfs_direct_req_release (dreq); goto out_release; } dreq->l_ctx = l_ctx;
fs/nfs/pagelist.c +8 -9
@@ -886,15 +886,6 @@ static int nfs_pageio_setup_mirroring(struct nfs_pageio_descriptor *pgio,return 0 ; } -/* -* nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1) -*/ -void nfs_pageio_stop_mirroring (struct nfs_pageio_descriptor *pgio) -{ - pgio->pg_mirror_count =1 ; - pgio->pg_mirror_idx =0 ; -} -static void nfs_pageio_cleanup_mirroring (struct nfs_pageio_descriptor *pgio) { pgio->pg_mirror_count =1 ;
@@ -1287,6 +1278,14 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index) } } +/* +* nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1) +*/ +void nfs_pageio_stop_mirroring (struct nfs_pageio_descriptor *pgio) +{ +nfs_pageio_complete (pgio); +} +int __init nfs_init_nfspagecache (void ) { nfs_page_cachep = kmem_cache_create("nfs_page",
fs/ocfs2/alloc.c +4 -0
@@ -7206,6 +7206,10 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;struct ocfs2_inline_data *idata = &di->id2.i_data; +/* No need to punch hole beyond i_size. */ +if (start >=i_size_read (inode)) +return 0 ; +if (end >i_size_read (inode)) end =i_size_read (inode);
include/linux/compiler.h +1 -1
@@ -502,7 +502,7 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s* compiler has support to do so. */ #define compiletime_assert (condition, msg) \ - _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) + _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)#define compiletime_assert_atomic_type (t) \ compiletime_assert(__native_word(t), \
include/linux/devfreq_cooling.h +1 -1
@@ -53,7 +53,7 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *dfc);#else /* !CONFIG_DEVFREQ_THERMAL */ -struct thermal_cooling_device * +static inline struct thermal_cooling_device *of_devfreq_cooling_register_power (struct device_node *np,struct devfreq *df,struct devfreq_cooling_power *dfc_power) {
include/linux/percpu_counter.h +2 -2
@@ -76,9 +76,9 @@ static inline s64 percpu_counter_read(struct percpu_counter *fbc)*/ static inline s64 percpu_counter_read_positive (struct percpu_counter *fbc) { -s64 ret = fbc->count; +/* Prevent reloads of fbc->count */ +s64 ret =READ_ONCE (fbc->count); -barrier ();/* Prevent reloads of fbc->count */ if (ret >=0 )return ret;return 0 ;
include/linux/sched.h +2 -2
@@ -1612,8 +1612,8 @@ struct task_struct {struct seccomp seccomp;/* Thread group tracking */ -u32 parent_exec_id; -u32 self_exec_id; +u64 parent_exec_id; +u64 self_exec_id;/* Protection of (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, * mempolicy */ spinlock_t alloc_lock;
include/net/ip6_route.h +1 -0
@@ -171,6 +171,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst,return rt->rt6i_flags &RTF_ANYCAST || (rt->rt6i_dst.plen !=128 && + !(rt->rt6i_flags & (RTF_GATEWAY |RTF_NONEXTHOP )) &&ipv6_addr_equal (&rt->rt6i_dst.addr, daddr)); }
kernel/futex.c +10 -2
@@ -1479,8 +1479,16 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)int oldval, ret;if (encoded_op & (FUTEX_OP_OPARG_SHIFT <<28 )) { -if (oparg <0 || oparg >31 ) -return -EINVAL ; +if (oparg <0 || oparg >31 ) { +char comm[sizeof (current->comm)]; +/* +* kill this print and return -EINVAL when userspace +* is sane again +*/ +pr_info_ratelimited ("futex_wake_op: %s tries to shift op by %d; fix this program\n" , +get_task_comm (comm, current), oparg); + oparg &=31 ; + } oparg =1 << oparg; }
kernel/kmod.c +2 -2
@@ -119,7 +119,7 @@ out:* invoke it. * * If module auto-loading support is disabled then this function -* becomes a no-operation. +* simply returns -ENOENT. */ int __request_module (bool wait,const char *fmt, ...) {
@@ -140,7 +140,7 @@ int __request_module(bool wait, const char *fmt, ...)WARN_ON_ONCE (wait &¤t_is_async ());if (!modprobe_path[0 ]) -return 0 ; +return -ENOENT ;va_start (args, fmt); ret =vsnprintf (module_name,MODULE_NAME_LEN , fmt, args);
kernel/locking/lockdep.c +4 -0
@@ -1265,9 +1265,11 @@ unsigned long lockdep_count_forward_deps(struct lock_class *class) this.class = class;raw_local_irq_save (flags); + current->lockdep_recursion =1 ;arch_spin_lock (&lockdep_lock); ret =__lockdep_count_forward_deps (&this);arch_spin_unlock (&lockdep_lock); + current->lockdep_recursion =0 ;raw_local_irq_restore (flags);return ret;
@@ -1292,9 +1294,11 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class) this.class = class;raw_local_irq_save (flags); + current->lockdep_recursion =1 ;arch_spin_lock (&lockdep_lock); ret =__lockdep_count_backward_deps (&this);arch_spin_unlock (&lockdep_lock); + current->lockdep_recursion =0 ;raw_local_irq_restore (flags);return ret;
kernel/locking/locktorture.c +4 -4
@@ -655,10 +655,10 @@ static void __torture_print_stats(char *page,if (statp[i].n_lock_fail) fail = true; sum += statp[i].n_lock_acquired; -if (max < statp[i].n_lock_fail) - max = statp[i].n_lock_fail; -if (min > statp[i].n_lock_fail) - min = statp[i].n_lock_fail; +if (max < statp[i].n_lock_acquired) + max = statp[i].n_lock_acquired; +if (min > statp[i].n_lock_acquired) + min = statp[i].n_lock_acquired; } page += sprintf(page, "%s: Total: %lld Max/Min: %ld/%ld %s Fail: %d %s\n",
kernel/signal.c +1 -1
@@ -1660,7 +1660,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)* This is only possible if parent == real_parent. * Check if it has changed security domain. */ -if (tsk->parent_exec_id != tsk->parent->self_exec_id) +if (tsk->parent_exec_id !=READ_ONCE (tsk->parent->self_exec_id)) sig =SIGCHLD ; }
kernel/trace/trace_events_trigger.c +3 -7
@@ -910,14 +910,10 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops, struct event_trigger_data *data, struct trace_event_file *file) { - int ret = register_trigger(glob, ops, data, file); - -if (ret >0 &&tracing_alloc_snapshot () !=0 ) { -unregister_trigger (glob, ops, data, file); - ret =0 ; - } + if (tracing_alloc_snapshot() != 0) + return 0; -return ret; + return register_trigger(glob, ops, data, file); } static int
net/ipv4/devinet.c +9 -4
@@ -560,12 +560,15 @@ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,return NULL ; } -static int ip_mc_config (struct sock *sk,bool join,const struct in_ifaddr *ifa) +static int ip_mc_autojoin_config (struct net *net,bool join, +const struct in_ifaddr *ifa) { +#if defined(CONFIG_IP_MULTICAST )struct ip_mreqn mreq = { .imr_multiaddr.s_addr = ifa->ifa_address, .imr_ifindex = ifa->ifa_dev->dev->ifindex, }; +struct sock *sk = net->ipv4.mc_autojoin_sk;int ret;ASSERT_RTNL ();
@@ -578,6 +581,9 @@ static int ip_mc_config(struct sock *sk, bool join, const struct in_ifaddr *ifa)release_sock (sk);return ret; +#else +return -EOPNOTSUPP ; +#endif }static int inet_rtm_deladdr (struct sk_buff *skb,struct nlmsghdr *nlh)
@@ -617,7 +623,7 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh)continue ;if (ipv4_is_multicast (ifa->ifa_address)) -ip_mc_config (net->ipv4.mc_autojoin_sk, false, ifa); +ip_mc_autojoin_config (net, false, ifa);__inet_del_ifa (in_dev, ifap,1 , nlh,NETLINK_CB (skb).portid);return 0 ; }
@@ -873,8 +879,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh)*/ set_ifa_lifetime (ifa, valid_lft, prefered_lft);if (ifa->ifa_flags &IFA_F_MCAUTOJOIN ) { -int ret =ip_mc_config (net->ipv4.mc_autojoin_sk, - true, ifa); +int ret =ip_mc_autojoin_config (net, true, ifa);if (ret <0 ) {inet_free_ifa (ifa);
security/keys/key.c +1 -1
@@ -376,7 +376,7 @@ int key_payload_reserve(struct key *key, size_t datalen)spin_lock (&key->user->lock);if (delta >0 && - (key->user->qnbytes + delta >= maxbytes || + (key->user->qnbytes + delta > maxbytes || key->user->qnbytes + delta < key->user->qnbytes)) { ret = -EDQUOT ; }
security/keys/keyctl.c +2 -2
@@ -853,8 +853,8 @@ long keyctl_chown_key(key_serial_t id, uid_t user, gid_t group) key_quota_root_maxbytes : key_quota_maxbytes;spin_lock (&newowner->lock); -if (newowner->qnkeys +1 >= maxkeys || - newowner->qnbytes + key->quotalen >= maxbytes || +if (newowner->qnkeys +1 > maxkeys || + newowner->qnbytes + key->quotalen > maxbytes || newowner->qnbytes + key->quotalen < newowner->qnbytes) goto quota_overrun;
sound/core/oss/pcm_plugin.c +24 -8
@@ -196,7 +196,9 @@ int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin)return 0 ; } -snd_pcm_sframes_t snd_pcm_plug_client_size (struct snd_pcm_substream *plug,snd_pcm_uframes_t drv_frames) +static snd_pcm_sframes_t plug_client_size (struct snd_pcm_substream *plug, +snd_pcm_uframes_t drv_frames, +bool check_size) {struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;int stream;
@@ -209,7 +211,7 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pif (stream ==SNDRV_PCM_STREAM_PLAYBACK ) { plugin =snd_pcm_plug_last (plug);while (plugin && drv_frames >0 ) { -if (drv_frames > plugin->buf_frames) +if (check_size && drv_frames > plugin->buf_frames) drv_frames = plugin->buf_frames; plugin_prev = plugin->prev;if (plugin->src_frames)
@@ -222,7 +224,7 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_p plugin_next = plugin->next;if (plugin->dst_frames) drv_frames = plugin->dst_frames (plugin, drv_frames); -if (drv_frames > plugin->buf_frames) +if (check_size && drv_frames > plugin->buf_frames) drv_frames = plugin->buf_frames; plugin = plugin_next; }
@@ -231,7 +233,9 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_preturn drv_frames; } -snd_pcm_sframes_t snd_pcm_plug_slave_size (struct snd_pcm_substream *plug,snd_pcm_uframes_t clt_frames) +static snd_pcm_sframes_t plug_slave_size (struct snd_pcm_substream *plug, +snd_pcm_uframes_t clt_frames, +bool check_size) {struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;snd_pcm_sframes_t frames;
@@ -252,14 +256,14 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pcif (frames <0 )return frames; } -if (frames > plugin->buf_frames) +if (check_size && frames > plugin->buf_frames) frames = plugin->buf_frames; plugin = plugin_next; } }else if (stream ==SNDRV_PCM_STREAM_CAPTURE ) { plugin =snd_pcm_plug_last (plug);while (plugin) { -if (frames > plugin->buf_frames) +if (check_size && frames > plugin->buf_frames) frames = plugin->buf_frames; plugin_prev = plugin->prev;if (plugin->src_frames) {
@@ -274,6 +278,18 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pcreturn frames; } +snd_pcm_sframes_t snd_pcm_plug_client_size (struct snd_pcm_substream *plug, +snd_pcm_uframes_t drv_frames) +{ +return plug_client_size (plug, drv_frames, false); +} + +snd_pcm_sframes_t snd_pcm_plug_slave_size (struct snd_pcm_substream *plug, +snd_pcm_uframes_t clt_frames) +{ +return plug_slave_size (plug, clt_frames, false); +} +static int snd_pcm_plug_formats (struct snd_mask *mask,snd_pcm_format_t format) {struct snd_mask formats = *mask;
@@ -628,7 +644,7 @@ snd_pcm_sframes_t snd_pcm_plug_write_transfer(struct snd_pcm_substream *plug, st src_channels = dst_channels; plugin = next; } -return snd_pcm_plug_client_size (plug, frames); +return plug_client_size (plug, frames, true); }snd_pcm_sframes_t snd_pcm_plug_read_transfer (struct snd_pcm_substream *plug,struct snd_pcm_plugin_channel *dst_channels_final,snd_pcm_uframes_t size)
@@ -638,7 +654,7 @@ snd_pcm_sframes_t snd_pcm_plug_read_transfer(struct snd_pcm_substream *plug, strsnd_pcm_sframes_t frames = size;int err; - frames =snd_pcm_plug_slave_size (plug, frames); + frames =plug_slave_size (plug, frames, true);if (frames <0 )return frames;
sound/pci/hda/hda_beep.c +5 -1
@@ -310,8 +310,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);struct hda_beep *beep = codec->beep; +int chs =get_amp_channels (kcontrol); +if (beep && (!beep->enabled || !ctl_has_mute (kcontrol))) { - ucontrol->value.integer.value[0 ] = +if (chs &1 ) + ucontrol->value.integer.value[0 ] = beep->enabled; +if (chs &2 ) ucontrol->value.integer.value[1 ] = beep->enabled;return 0 ; }
sound/pci/hda/hda_codec.c +1 -0
@@ -876,6 +876,7 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,/* power-up all before initialization */ hda_set_power_state (codec,AC_PWRST_D0 ); + codec->core.dev.power.power_state =PMSG_ON ;snd_hda_codec_proc_new (codec);
sound/pci/hda/hda_intel.c +21 -14
@@ -1839,24 +1839,15 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) {struct snd_card *card = context;struct azx *chip = card->private_data; -struct pci_dev *pci = chip->pci; - -if (!fw) { -dev_err (card->dev,"Cannot load firmware, aborting\n" ); - goto error; - } - chip->fw = fw; +if (fw) + chip->fw = fw; +else +dev_err (card->dev,"Cannot load firmware, continue without patching\n" );if (!chip->disabled) {/* continue probing */ -if (azx_probe_continue (chip)) - goto error; +azx_probe_continue (chip); } -return ;/* OK */ - - error: -snd_card_free (card); -pci_set_drvdata (pci,NULL ); }#endif
@@ -1982,6 +1973,17 @@ static const struct hdac_io_ops pci_hda_io_ops = { .dma_free_pages = dma_free_pages, }; +/* Blacklist for skipping the whole probe: +* some HD-audio PCI entries are exposed without any codecs, and such devices +* should be ignored from the beginning. +*/ +static const struct snd_pci_quirk driver_blacklist[] = { +SND_PCI_QUIRK (0x1043 ,0x874f ,"ASUS ROG Zenith II / Strix" ,0 ), +SND_PCI_QUIRK (0x1462 ,0xcb59 ,"MSI TRX40 Creator" ,0 ), +SND_PCI_QUIRK (0x1462 ,0xcb60 ,"MSI TRX40" ,0 ), + {} +}; +static const struct hda_controller_ops pci_hda_ops = { .disable_msi_reset_irq = disable_msi_reset_irq, .substream_alloc_pages = substream_alloc_pages,
@@ -2001,6 +2003,11 @@ static int azx_probe(struct pci_dev *pci,bool schedule_probe;int err; +if (snd_pci_quirk_lookup (pci, driver_blacklist)) { +dev_info (&pci->dev,"Skipping the blacklisted device\n" ); +return -ENODEV ; + } +if (dev >=SNDRV_CARDS )return -ENODEV ;if (!enable[dev]) {
sound/pci/ice1712/prodigy_hifi.c +2 -2
@@ -569,7 +569,7 @@ static int wm_adc_mux_enum_get(struct snd_kcontrol *kcontrol,struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol);mutex_lock (&ice->gpio_mutex); - ucontrol->value.integer.value[0 ] =wm_get (ice,WM_ADC_MUX ) &0x1f ; + ucontrol->value.enumerated.item[0 ] =wm_get (ice,WM_ADC_MUX ) &0x1f ;mutex_unlock (&ice->gpio_mutex);return 0 ; }
@@ -583,7 +583,7 @@ static int wm_adc_mux_enum_put(struct snd_kcontrol *kcontrol,mutex_lock (&ice->gpio_mutex); oval =wm_get (ice,WM_ADC_MUX ); - nval = (oval &0xe0 ) | ucontrol->value.integer.value[0 ]; + nval = (oval &0xe0 ) | ucontrol->value.enumerated.item[0 ];if (nval != oval) {wm_put (ice,WM_ADC_MUX , nval); change =1 ;
sound/soc/intel/atom/sst-atom-controls.c +1 -1
@@ -1318,7 +1318,7 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) dai->capture_widget->name); w = dai->capture_widget;snd_soc_dapm_widget_for_each_source_path (w, p) { -if (p->connected && !p->connected (w, p->sink)) +if (p->connected && !p->connected (w, p->source))continue ; if (p->connect && p->source->power &&
sound/soc/intel/atom/sst/sst_pci.c +1 -1
@@ -107,7 +107,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)dev_dbg (ctx->dev,"DRAM Ptr %p\n" , ctx->dram); do_release_regions:pci_release_regions (pci); -return 0 ; +return ret; }/*
sound/soc/soc-dapm.c +7 -1
@@ -751,7 +751,13 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i) val = max - val; p->connect = !!val; }else { - p->connect =0 ; +/* since a virtual mixer has no backing registers to +* decide which path to connect, it will try to match +* with initial state. This is to ensure +* that the default mixer choice will be +* correctly powered up during initialization. +*/ + p->connect = invert; } }
sound/soc/soc-ops.c +2 -2
@@ -837,7 +837,7 @@ int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,unsigned int regbase = mc->regbase;unsigned int regcount = mc->regcount;unsigned int regwshift = component->val_bytes *BITS_PER_BYTE ; -unsigned int regwmask = (1 <<regwshift)-1 ; +unsigned int regwmask = (1UL <<regwshift)-1 ;unsigned int invert = mc->invert;unsigned long mask = (1UL <<mc->nbits)-1 ;long min = mc->min;
@@ -886,7 +886,7 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol,unsigned int regbase = mc->regbase;unsigned int regcount = mc->regcount;unsigned int regwshift = component->val_bytes *BITS_PER_BYTE ; -unsigned int regwmask = (1 <<regwshift)-1 ; +unsigned int regwmask = (1UL <<regwshift)-1 ;unsigned int invert = mc->invert;unsigned long mask = (1UL <<mc->nbits)-1 ;long max = mc->max;
sound/soc/soc-pcm.c +4 -2
@@ -1951,7 +1951,8 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,switch (cmd) {case SNDRV_PCM_TRIGGER_START :if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PREPARE ) && - (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP )) + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED ))continue ; ret =dpcm_do_trigger (dpcm, be_substream, cmd);
@@ -1981,7 +1982,8 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;case SNDRV_PCM_TRIGGER_STOP : -if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) +if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED ))continue ;if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream))
sound/soc/soc-topology.c +1 -1
@@ -378,7 +378,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg,struct snd_soc_component *comp = tplg->comp;return soc_tplg_add_dcontrol (comp->card->snd_card, - comp->dev, k,NULL , comp, kcontrol); + comp->dev, k, comp->name_prefix, comp, kcontrol); }/* remove a mixer kcontrol */
sound/usb/mixer.c +1 -1
@@ -2269,7 +2269,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (map->id == state.chip->usb_id) { state.map = map->map; state.selector_map = map->selector_map; - mixer->ignore_ctl_error = map->ignore_ctl_error; + mixer->ignore_ctl_error |= map->ignore_ctl_error;break ; } }
sound/usb/mixer_maps.c +28 -0
@@ -361,6 +361,14 @@ static const struct usbmix_name_map dell_alc4020_map[] = { { 0 } }; +/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX +* response for Input Gain Pad (id=19, control=12). Skip it. +*/ +static const struct usbmix_name_map asus_rog_map[] = { + {19 ,NULL ,12 },/* FU, Input Gain Pad */ + {} +}; +/* * Control map entries */
@@ -480,6 +488,26 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x05a7, 0x1020), .map = bose_companion5_map, }, + { /* Gigabyte TRX40 Aorus Pro WiFi */ + .id = USB_ID(0x0414, 0xa002), + .map = asus_rog_map, + }, + { /* ASUS ROG Zenith II */ + .id = USB_ID(0x0b05, 0x1916), + .map = asus_rog_map, + }, + { /* ASUS ROG Strix */ + .id = USB_ID(0x0b05, 0x1917), + .map = asus_rog_map, + }, + { /* MSI TRX40 Creator */ + .id = USB_ID(0x0db0, 0x0d64), + .map = asus_rog_map, + }, + { /* MSI TRX40 */ + .id = USB_ID(0x0db0, 0x543d), + .map = asus_rog_map, + }, { 0 } /* terminator */ };
tools/testing/selftests/x86/ptrace_syscall.c +6 -2
@@ -284,8 +284,12 @@ int main()#if defined(__i386__) && (!defined(__GLIBC__) || __GLIBC__ >2 || __GLIBC_MINOR__ >=16 ) vsyscall32 = (void *)getauxval (AT_SYSINFO ); -printf ("[RUN]\tCheck AT_SYSINFO return regs\n" ); -test_sys32_regs (do_full_vsyscall32); +if (vsyscall32) { +printf ("[RUN]\tCheck AT_SYSINFO return regs\n" ); +test_sys32_regs (do_full_vsyscall32); + }else { +printf ("[SKIP]\tAT_SYSINFO is not available\n" ); + }#endif test_ptrace_syscall_restart ();