Linux 4.4.185
Greg KH
maintainerI'm announcing the release of the 4.4.185 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 | 4 +- arch/arc/Kconfig | 8 ----- arch/arc/Makefile | 4 -- arch/arc/include/asm/bug.h | 3 + arch/arc/include/asm/elf.h | 2 - arch/arc/kernel/setup.c | 2 - arch/arc/kernel/traps.c | 8 +++++ arch/arm/mach-imx/cpuidle-imx6sx.c | 3 + arch/arm64/kernel/vdso.c | 10 +++--- arch/ia64/include/asm/bug.h | 6 +++ arch/m68k/include/asm/bug.h | 3 + arch/mips/Kconfig | 1 arch/mips/include/asm/compiler.h | 35 +++++++++++++++++++++++ arch/mips/kernel/uprobes.c | 3 - arch/mips/math-emu/cp1emu.c | 4 +- arch/parisc/math-emu/cnv_float.h | 8 ++--- arch/sparc/include/asm/bug.h | 6 +++ arch/sparc/kernel/perf_event.c | 4 ++ arch/um/os-Linux/file.c | 1 arch/um/os-Linux/signal.c | 2 + arch/x86/kernel/cpu/bugs.c | 11 ++++++- arch/x86/kvm/x86.c | 9 +++-- arch/x86/um/stub_segv.c | 1 crypto/crypto_user.c | 3 + drivers/dma/imx-sdma.c | 4 +- drivers/hwmon/pmbus/pmbus_core.c | 34 +++++++++++++++++++--- drivers/input/misc/uinput.c | 22 +++++++++++++- drivers/mfd/omap-usb-tll.c | 4 +- drivers/net/bonding/bond_main.c | 2 - drivers/net/can/flexcan.c | 2 - drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++ drivers/net/team/team.c | 2 - drivers/parport/share.c | 2 + drivers/s390/net/qeth_l2_main.c | 2 - drivers/scsi/hpsa.c | 7 +++- drivers/scsi/hpsa_cmd.h | 1 drivers/scsi/ufs/ufshcd.c | 3 + drivers/scsi/vmw_pvscsi.c | 6 ++- drivers/spi/spi-bitbang.c | 2 - drivers/staging/rdma/hfi1/chip.c | 1 drivers/tty/rocket.c | 2 - drivers/usb/chipidea/udc.c | 20 +++++++++++++ drivers/usb/gadget/udc/fusb300_udc.c | 5 +++ drivers/usb/gadget/udc/lpc32xx_udc.c | 3 - fs/9p/acl.c | 2 - fs/binfmt_flat.c | 24 ++++----------- fs/btrfs/dev-replace.c | 29 ++++++++++++------- fs/btrfs/reada.c | 7 ++++ fs/btrfs/volumes.c | 2 + fs/btrfs/volumes.h | 5 +++ fs/cifs/smb2maperror.c | 2 - fs/overlayfs/inode.c | 13 ++++++++ include/asm-generic/bug.h | 1 include/linux/compiler-gcc.h | 15 +++++++++ include/linux/compiler.h | 5 +++ include/linux/swiotlb.h | 3 + include/net/bluetooth/hci_core.h | 3 + include/net/busy_poll.h | 2 - kernel/cpu.c | 3 + kernel/ptrace.c | 4 -- kernel/trace/trace.c | 6 --- kernel/trace/trace.h | 18 +++++++++++ kernel/trace/trace_kdb.c | 6 --- lib/mpi/mpi-pow.c | 6 +-- mm/page_idle.c | 4 +- net/9p/protocol.c | 12 +++++-- net/9p/trans_common.c | 1 net/9p/trans_rdma.c | 7 +--- net/bluetooth/hci_conn.c | 10 +++++- net/bluetooth/l2cap_core.c | 33 ++++++++++++++++++--- net/can/af_can.c | 1 net/ipv4/raw.c | 2 - net/mac80211/rx.c | 2 + net/sctp/endpointola.c | 8 ++--- net/tipc/core.c | 12 +++---- net/tipc/netlink_compat.c | 18 +++++++++-- net/wireless/core.c | 2 - scripts/checkstack.pl | 2 - security/apparmor/policy_unpack.c | 2 - sound/core/seq/oss/seq_oss_ioctl.c | 2 - sound/core/seq/oss/seq_oss_rw.c | 2 - sound/firewire/amdtp-am824.c | 2 - sound/soc/codecs/cs4265.c | 2 - sound/soc/codecs/max98090.c | 16 ++++++++++ sound/usb/mixer_quirks.c | 4 +- tools/perf/builtin-help.c | 2 - tools/perf/ui/tui/helpline.c | 2 - 87 files changed, 423 insertions(+), 150 deletions(-)
Adeodato Simó (1):
net/9p: include trans_common.h to fix missing prototype warning.
Alejandro Jimenez (1):
x86/speculation: Allow guests to use SSBD even if host does not
Alexandra Winter (1):
s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
Alexandre Belloni (1):
usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Andrey Smirnov (1):
Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
Arnaldo Carvalho de Melo (2):
perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul perf help: Remove needless use of strncpy()
Arnd Bergmann (2):
mfd: omap-usb-tll: Fix register offsets
bug.h: work around GCC PR82365 in BUG()
Avri Altman (1):
scsi: ufs: Check that space was properly alloced in copy_query_response
Colin Ian King (3):
mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
ALSA: usb-audio: fix sign unintended sign extension on left shifts
Dominique Martinet (4):
9p/rdma: do not disconnect on down_interruptible EAGAIN 9p: acl: fix uninitialized iattr access 9p/rdma: remove useless check in cm_event_handler 9p: p9dirent_read: check network-provided name length
Don Brace (1):
scsi: hpsa: correct ioaccel2 chaining
Eric Biggers (2):
cfg80211: fix memory leak of wiphy device name
crypto: user - prevent operating on larval algorithms
Fabio Estevam (1):
ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
Filipe Manana (1):
Btrfs: fix race between readahead and device replace/removal
Geert Uytterhoeven (1):
cpu/speculation: Warn on unsupported mitigations= parameter
George G. Davis (1):
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
Greg Kroah-Hartman (1):
Linux 4.4.185
Helge Deller (1):
parisc: Fix compiler warnings in float emulation code
Herbert Xu (1):
lib/mpi: Fix karactx leak in mpi_powm
Jan Kara (1):
scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
Jann Horn (3):
fs/binfmt_flat.c: make load_flat_shared_library() work
apparmor: enforce nullbyte at end of tag string
ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
Jason A. Donenfeld (1):
um: Compile with modern headers
Joakim Zhang (1):
can: flexcan: fix timeout when set small bitrate
Johannes Berg (1):
mac80211: drop robust management frames from unknown TA
Josh Elsasser (1):
net: check before dereferencing netdev_ops during busy poll
Kees Cook (1):
arm64, vdso: Define vdso_{start,end} as array
Linus Torvalds (2):
gcc-9: silence 'address-of-packed-member' warning
tty: rocket: fix incorrect forward declaration of 'rp_init()'
Manuel Lauss (1):
MIPS: math-emu: do not use bools for arithmetic
Marcel Holtmann (2):
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Bluetooth: Fix regression with minimum encryption key size alignment
Matias Karhumaa (1):
Bluetooth: Fix faulty expression for minimum encryption key size check
Matt Flax (1):
ASoC : cs4265 : readable register too low
Miguel Ojeda (1):
tracing: Silence GCC 9 array bounds warning
Mike Marciniszyn (1):
IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
Naohiro Aota (1):
btrfs: start readahead also in seed devices
Nikolay Borisov (1):
btrfs: Ensure replaced device doesn't have pending chunk allocation
Paolo Bonzini (1):
KVM: x86: degrade WARN to pr_warn_ratelimited
Paul Burton (1):
MIPS: Workaround GCC __builtin_unreachable reordering bug
Peter Chen (1):
usb: chipidea: udc: workaround for endpoint conflict issue
Robert Hancock (1):
hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
Robin Gong (1):
dmaengine: imx-sdma: remove BD_INTR for channel0
Stephen Suryaputra (1):
ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
Steve French (1):
SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
Takashi Sakamoto (1):
ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
Thierry Reding (1):
swiotlb: Make linux/swiotlb.h standalone includible
Vineet Gupta (3):
ARC: Assume multiplier is always present
ARC: fix build warning in elf.h
ARC: handle gcc generated __builtin_trap for older compiler
Vivek Goyal (1):
ovl: modify ovl_permission() to do checks on two inodes
Wanpeng Li (1):
KVM: X86: Fix scan ioapic use-before-initialization
Willem de Bruijn (1):
can: purge socket error queue on sock destruct
Xin Long (3):
sctp: change to hold sk after auth shkey is created successfully
tipc: change to use register_pernet_device
tipc: check msg->req data len in tipc_nl_compat_bearer_disable
Yonglong Liu (1):
net: hns: Fix loopback test failed at copper ports
Young Xiao (2):
sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
Yu-Hsuan Hsu (1):
ASoC: max98090: remove 24-bit format support if RJ is 0
YueHaibing (5):
parport: Fix mem leak in parport_register_dev_model
MIPS: uprobes: remove set but not used variable 'epc'
team: Always enable vlan tx offload
bonding: Always enable vlan tx offload
spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
Greg KH
maintainerMakefile +2 -2
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 184 +SUBLEVEL = 185 EXTRAVERSION = NAME = Blurry Fish Butt
@@ -636,6 +636,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) +KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -712,7 +713,6 @@ ifeq ($(cc-name),clang) KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,) KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) KBUILD_CFLAGS += $(call cc-disable-warning, gnu) -KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) # Quiet clang warning: comparison of unsigned expression < 0 is always false KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) # CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
arch/arc/Kconfig +0 -8
@@ -278,14 +278,6 @@ config ARC_DCCM_BASE default "0xA0000000" depends on ARC_HAS_DCCM -config ARC_HAS_HW_MPY - bool "Use Hardware Multiplier (Normal or Faster XMAC)" - default y - help - Influences how gcc generates code for MPY operations. - If enabled, MPYxx insns are generated, provided by Standard/XMAC - Multipler. Otherwise software multipy lib is used - choice prompt "MMU Version" default ARC_MMU_V3 if ARC_CPU_770
arch/arc/Makefile +0 -4
@@ -72,10 +72,6 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB # --build-id w/o "-marclinux". Default arc-elf32-ld is OK ldflags-$(upto_gcc44) += -marclinux -ifndef CONFIG_ARC_HAS_HW_MPY - cflags-y += -mno-mpy -endif - LIBGCC := $(shell $(CC) $(cflags-y) --print-libgcc-file-name) # Modules with short calls might break for calls into builtin-kernel
arch/arc/include/asm/bug.h +2 -1
@@ -23,7 +23,8 @@ void die(const char *str, struct pt_regs *regs, unsigned long address);#define BUG () do { \ pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ - dump_stack(); \ + barrier_before_unreachable(); \ + __builtin_trap(); \ } while (0)#define HAVE_ARCH_BUG
arch/arc/include/asm/elf.h +1 -1
@@ -55,7 +55,7 @@ extern int elf_check_arch(const struct elf32_hdr *);* the loader. We need to make sure that it is out of the way of the program * that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) +#define ELF_ET_DYN_BASE (2UL * TASK_SIZE / 3)/* * When the program starts, a1 contains a pointer to a function to be
arch/arc/kernel/setup.c +0 -2
@@ -232,8 +232,6 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) n +=scnprintf (buf + n, len - n,"mpy[opt %d] " , opt); } - n +=scnprintf (buf + n, len - n,"%s" , -IS_USED_CFG (CONFIG_ARC_HAS_HW_MPY )); } n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n",
arch/arc/kernel/traps.c +8 -0
@@ -155,3 +155,11 @@ void do_insterror_or_kprobe(unsigned long address, struct pt_regs *regs)insterror_is_error (address, regs); } + +/* +* abort() call generated by older gcc for __builtin_trap() +*/ +void abort (void ) +{ + __asm__ __volatile__("trap_s 5\n" ); +}
arch/arm/mach-imx/cpuidle-imx6sx.c +2 -1
@@ -14,6 +14,7 @@#include "common.h" #include "cpuidle.h" +#include "hardware.h" static int imx6sx_idle_finish (unsigned long val) {
@@ -97,7 +98,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (0xf ,1 ); +imx_gpc_set_arm_power_up_timing (cpu_is_imx6sx () ?0xf :0x2 ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
arch/arm64/kernel/vdso.c +5 -5
@@ -36,7 +36,7 @@#include <asm/vdso.h> #include <asm/vdso_datapage.h> -extern char vdso_start, vdso_end; +extern char vdso_start[], vdso_end[];static unsigned long vdso_pages;static struct page **vdso_pagelist;
@@ -115,14 +115,14 @@ static int __init vdso_init(void) {int i; -if (memcmp (&vdso_start,"\177ELF" ,4 )) { +if (memcmp (vdso_start,"\177ELF" ,4 )) {pr_err ("vDSO is not a valid ELF object!\n" );return -EINVAL ; } - vdso_pages = (&vdso_end - &vdso_start) >>PAGE_SHIFT ; + vdso_pages = (vdso_end - vdso_start) >>PAGE_SHIFT ;pr_info ("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n" , - vdso_pages +1 , vdso_pages, &vdso_start,1L , vdso_data); + vdso_pages +1 , vdso_pages, vdso_start,1L , vdso_data);/* Allocate the vDSO pagelist, plus a page for the data. */ vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -135,7 +135,7 @@ static int __init vdso_init(void)/* Grab the vDSO code pages. */ for (i =0 ; i < vdso_pages; i++) - vdso_pagelist[i +1 ] =virt_to_page (&vdso_start + i *PAGE_SIZE ); + vdso_pagelist[i +1 ] =virt_to_page (vdso_start + i *PAGE_SIZE );/* Populate the special mapping structures */ vdso_spec[0 ] = (struct vm_special_mapping ) {
arch/ia64/include/asm/bug.h +5 -1
@@ -3,7 +3,11 @@#ifdef CONFIG_BUG #define ia64_abort () __builtin_trap() -#define BUG () do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) +#define BUG () do { \ + printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ + ia64_abort(); \ +} while (0)/* should this BUG be made generic? */ #define HAVE_ARCH_BUG
arch/m68k/include/asm/bug.h +3 -0
@@ -7,16 +7,19 @@#ifndef CONFIG_SUN3 #define BUG () do { \ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#else #define BUG () do { \ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ panic("BUG!"); \ } while (0)#endif #else #define BUG () do { \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#endif
arch/mips/Kconfig +1 -0
@@ -13,6 +13,7 @@ config MIPS select HAVE_OPROFILE select HAVE_PERF_EVENTS select PERF_USE_VMALLOC + select HAVE_ARCH_COMPILER_H select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK
arch/mips/include/asm/compiler.h +35 -0
@@ -8,6 +8,41 @@#ifndef _ASM_COMPILER_H#define _ASM_COMPILER_H +/* +* With GCC 4.5 onwards we can use __builtin_unreachable to indicate to the +* compiler that a particular code path will never be hit. This allows it to be +* optimised out of the generated binary. +* +* Unfortunately at least GCC 4.6.3 through 7.3.0 inclusive suffer from a bug +* that can lead to instructions from beyond an unreachable statement being +* incorrectly reordered into earlier delay slots if the unreachable statement +* is the only content of a case in a switch statement. This can lead to +* seemingly random behaviour, such as invalid memory accesses from incorrectly +* reordered loads or stores. See this potential GCC fix for details: +* +* https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00360.html +* +* It is unclear whether GCC 8 onwards suffer from the same issue - nothing +* relevant is mentioned in GCC 8 release notes and nothing obviously relevant +* stands out in GCC commit logs, but these newer GCC versions generate very +* different code for the testcase which doesn't exhibit the bug. +* +* GCC also handles stack allocation suboptimally when calling noreturn +* functions or calling __builtin_unreachable(): +* +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82365 +* +* We work around both of these issues by placing a volatile asm statement, +* which GCC is prevented from reordering past, prior to __builtin_unreachable +* calls. +* +* The .insn statement is required to ensure that any branches to the +* statement, which sadly must be kept due to the asm statement, are known to +* be branches to code and satisfy linker requirements for microMIPS kernels. +*/ +#undef barrier_before_unreachable +#define barrier_before_unreachable () asm volatile(".insn") +#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >=4 )#define GCC_IMM_ASM () "n"#define GCC_REG_ACCUM "$0"
arch/mips/kernel/uprobes.c +0 -3
@@ -164,9 +164,6 @@ int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs)*/ aup->resume_epc = regs->cp0_epc +4 ;if (insn_has_delay_slot ((union mips_instruction ) aup->insn[0 ])) { -unsigned long epc; - - epc = regs->cp0_epc;__compute_return_epc_for_insn (regs, (union mips_instruction ) aup->insn[0 ]); aup->resume_epc = regs->cp0_epc;
arch/mips/math-emu/cp1emu.c +2 -2
@@ -829,12 +829,12 @@ do { \ } while (0)#define DIFROMREG (di, x) \ - ((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) == 0)], 0)) + ((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) ^ 1)], 0))#define DITOREG (di, x) \ do { \ unsigned fpr, i; \ - fpr = (x) & ~(cop1_64bit(xcp) == 0); \ + fpr = (x) & ~(cop1_64bit(xcp) ^ 1); \ set_fpr64(&ctx->fpr[fpr], 0, di); \ for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val64); i++) \ set_fpr64(&ctx->fpr[fpr], i, 0); \
arch/parisc/math-emu/cnv_float.h +4 -4
@@ -60,19 +60,19 @@ ((exponent < (SGL_P -1 )) ? \ (Sall(sgl_value) << (SGL_EXP_LENGTH + 1 + exponent)) : FALSE) -#define Int_isinexact_to_sgl (int_value) (int_value << 33 - SGL_EXP_LENGTH) +#define Int_isinexact_to_sgl (int_value) ((int_value << 33 - SGL_EXP_LENGTH) != 0) #define Sgl_roundnearest_from_int(int_value,sgl_value) \ if (int_value & 1<<(SGL_EXP_LENGTH - 2)) /* round bit */ \ - if ((int_value << 34 - SGL_EXP_LENGTH) || Slow(sgl_value)) \ + if (((int_value << 34 - SGL_EXP_LENGTH) != 0) || Slow(sgl_value)) \ Sall(sgl_value)++#define Dint_isinexact_to_sgl (dint_valueA,dint_valueB) \ - ((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) || Dintp2(dint_valueB)) + (((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) != 0) || Dintp2(dint_valueB))#define Sgl_roundnearest_from_dint (dint_valueA,dint_valueB,sgl_value) \ if (Dintp1(dint_valueA) & 1<<(SGL_EXP_LENGTH - 2)) \ - if ((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) || \ + if (((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) != 0) || \ Dintp2(dint_valueB) || Slow(sgl_value)) Sall(sgl_value)++#define Dint_isinexact_to_dbl (dint_value) \
arch/sparc/include/asm/bug.h +5 -1
@@ -8,10 +8,14 @@void do_BUG (const char *file,int line);#define BUG () do { \ do_BUG(__FILE__, __LINE__); \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#else -#define BUG () __builtin_trap() +#define BUG () do { \ + barrier_before_unreachable(); \ + __builtin_trap(); \ +} while (0)#endif #define HAVE_ARCH_BUG
arch/sparc/kernel/perf_event.c +4 -0
@@ -889,6 +889,10 @@ static int sparc_perf_event_set_period(struct perf_event *event,s64 period = hwc->sample_period;int ret =0 ; +/* The period may have been changed by PERF_EVENT_IOC_PERIOD */ +if (unlikely (period != hwc->last_period)) + left = period - (hwc->last_period - left); +if (unlikely (left <= -period)) { left = period;local64_set (&hwc->period_left, left);
arch/um/os-Linux/file.c +1 -0
@@ -12,6 +12,7 @@#include <sys/mount.h> #include <sys/socket.h> #include <sys/stat.h> +#include <sys/sysmacros.h> #include <sys/un.h> #include <sys/types.h> #include <os.h>
arch/um/os-Linux/signal.c +2 -0
@@ -14,7 +14,9 @@#include <as-layout.h> #include <kern_util.h> #include <os.h> +#include <sys/ucontext.h> #include <sysdep/mcontext.h> +#include <um_malloc.h> void (*sig_info[NSIG ])(int ,struct siginfo *,struct uml_pt_regs *) = { [SIGTRAP ] = relay_signal,
arch/x86/kernel/cpu/bugs.c +10 -1
@@ -806,6 +806,16 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)break ; } +/* +* If SSBD is controlled by the SPEC_CTRL MSR, then set the proper +* bit in the mask to allow guests to use the mitigation even in the +* case where the host does not enable it. +*/ +if (static_cpu_has (X86_FEATURE_SPEC_CTRL_SSBD ) || +static_cpu_has (X86_FEATURE_AMD_SSBD )) { + x86_spec_ctrl_mask |=SPEC_CTRL_SSBD ; + } +/* * We have three CPU feature flags that are in play here: * - X86_BUG_SPEC_STORE_BYPASS - CPU is susceptible.
@@ -823,7 +833,6 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)x86_amd_ssb_disable (); }else { x86_spec_ctrl_base |=SPEC_CTRL_SSBD ; - x86_spec_ctrl_mask |=SPEC_CTRL_SSBD ;wrmsrl (MSR_IA32_SPEC_CTRL , x86_spec_ctrl_base); } }
arch/x86/kvm/x86.c +5 -4
@@ -1293,7 +1293,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) vcpu->arch.tsc_always_catchup =1 ;return 0 ; }else { -WARN (1 ,"user requested TSC rate below hardware speed\n" ); +pr_warn_ratelimited ("user requested TSC rate below hardware speed\n" );return -1 ; } }
@@ -1303,8 +1303,8 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) user_tsc_khz, tsc_khz);if (ratio ==0 || ratio >= kvm_max_tsc_scaling_ratio) { -WARN_ONCE (1 ,"Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , - user_tsc_khz); +pr_warn_ratelimited ("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , + user_tsc_khz);return -1 ; }
@@ -6409,7 +6409,8 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)kvm_scan_ioapic_routes (vcpu, vcpu->arch.eoi_exit_bitmap); else { kvm_x86_ops->sync_pir_to_irr (vcpu); -kvm_ioapic_scan_entry (vcpu, vcpu->arch.eoi_exit_bitmap); +if (ioapic_in_kernel (vcpu->kvm)) +kvm_ioapic_scan_entry (vcpu, vcpu->arch.eoi_exit_bitmap); } kvm_x86_ops->load_eoi_exitmap (vcpu); }
arch/x86/um/stub_segv.c +1 -0
@@ -6,6 +6,7 @@#include <sysdep/stub.h> #include <sysdep/faultinfo.h> #include <sysdep/mcontext.h> +#include <sys/ucontext.h> void __attribute__ ((__section__ (".__syscall_stub" )))stub_segv_handler (int sig,siginfo_t *info,void *p)
crypto/crypto_user.c +3 -0
@@ -54,6 +54,9 @@ static struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact)list_for_each_entry (q, &crypto_alg_list, cra_list) {int match =0 ; +if (crypto_is_larval (q)) +continue ; +if ((q->cra_flags ^ p->cru_type) & p->cru_mask)continue ;
drivers/dma/imx-sdma.c +2 -2
@@ -614,7 +614,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,spin_lock_irqsave (&sdma->channel_0_lock, flags); bd0->mode.command =C0_SETPM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count = size /2 ; bd0->buffer_addr = buf_phys; bd0->ext_buffer_addr = address;
@@ -883,7 +883,7 @@ static int sdma_load_context(struct sdma_channel *sdmac) context->gReg[7 ] = sdmac->watermark_level; bd0->mode.command =C0_SETDM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count =sizeof (*context) /4 ; bd0->buffer_addr = sdma->context_phys; bd0->ext_buffer_addr =2048 + (sizeof (*context) /4 ) * channel;
drivers/hwmon/pmbus/pmbus_core.c +30 -4
@@ -1028,14 +1028,15 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,const struct pmbus_driver_info *info, const char *name, int index, int page, - const struct pmbus_sensor_attr *attr) + const struct pmbus_sensor_attr *attr, + bool paged) { struct pmbus_sensor *base;int ret;if (attr->label) { ret =pmbus_add_label (data, name, index, attr->label, - attr->paged ? page +1 :0 ); + paged ? page +1 :0 );if (ret)return ret; }
@@ -1067,6 +1068,30 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,return 0 ; } +static bool pmbus_sensor_is_paged (const struct pmbus_driver_info *info, +const struct pmbus_sensor_attr *attr) +{ +int p; + +if (attr->paged) +return true; + +/* +* Some attributes may be present on more than one page despite +* not being marked with the paged attribute. If that is the case, +* then treat the sensor as being paged and add the page suffix to the +* attribute name. +* We don't just add the paged attribute to all such attributes, in +* order to maintain the un-suffixed labels in the case where the +* attribute is only on page 0. +*/ +for (p =1 ; p < info->pages; p++) { +if (info->func[p] & attr->func) +return true; + } +return false; +} + static int pmbus_add_sensor_attrs(struct i2c_client *client, struct pmbus_data *data, const char *name,
@@ -1080,14 +1105,15 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, index =1 ;for (i =0 ; i < nattrs; i++) {int page, pages; +bool paged =pmbus_sensor_is_paged (info, attrs); - pages = attrs->paged ? info->pages :1 ; + pages = paged ? info->pages :1 ;for (page =0 ; page < pages; page++) {if (!(info->func[page] & attrs->func))continue ; ret =pmbus_add_sensor_attrs_one (client, data, info, name, index, page, - attrs); + attrs, paged);if (ret)return ret; index++;
drivers/input/misc/uinput.c +20 -2
@@ -894,13 +894,31 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)#ifdef CONFIG_COMPAT -#define UI_SET_PHYS_COMPAT _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +/* +* These IOCTLs change their size and thus their numbers between +* 32 and 64 bits. +*/ +#define UI_SET_PHYS_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +#define UI_BEGIN_FF_UPLOAD_COMPAT \ + _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload_compat) +#define UI_END_FF_UPLOAD_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload_compat)static long uinput_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -if (cmd ==UI_SET_PHYS_COMPAT ) +switch (cmd) { +case UI_SET_PHYS_COMPAT : cmd =UI_SET_PHYS ; +break ; +case UI_BEGIN_FF_UPLOAD_COMPAT : + cmd =UI_BEGIN_FF_UPLOAD ; +break ; +case UI_END_FF_UPLOAD_COMPAT : + cmd =UI_END_FF_UPLOAD ; +break ; + }return uinput_ioctl_handler (file, cmd, arg,compat_ptr (arg)); }
drivers/mfd/omap-usb-tll.c +2 -2
@@ -129,12 +129,12 @@ static inline u32 usbtll_read(void __iomem *base, u32 reg)return readl_relaxed (base + reg); } -static inline void usbtll_writeb (void __iomem *base,u8 reg,u8 val) +static inline void usbtll_writeb (void __iomem *base,u32 reg,u8 val) {writeb_relaxed (val, base + reg); } -static inline u8 usbtll_readb (void __iomem *base,u8 reg) +static inline u8 usbtll_readb (void __iomem *base,u32 reg) {return readb_relaxed (base + reg); }
drivers/net/bonding/bond_main.c +1 -1
@@ -4164,13 +4164,13 @@ void bond_setup(struct net_device *bond_dev) bond_dev->features |=NETIF_F_NETNS_LOCAL ; bond_dev->hw_features =BOND_VLAN_FEATURES | -NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_CTAG_FILTER ; bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM ); bond_dev->hw_features |=NETIF_F_GSO_ENCAP_ALL ; bond_dev->features |= bond_dev->hw_features; + bond_dev->features |=NETIF_F_HW_VLAN_CTAG_TX ; }/* Destroy a bonding device.
drivers/net/can/flexcan.c +1 -1
@@ -171,7 +171,7 @@#define FLEXCAN_MB_CNT_LENGTH (x) (((x) & 0xf) << 16)#define FLEXCAN_MB_CNT_TIMESTAMP (x) ((x) & 0xffff) -#define FLEXCAN_TIMEOUT_US (50) +#define FLEXCAN_TIMEOUT_US (250)/* FLEXCAN hardware feature flags *
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +4 -0
@@ -351,6 +351,7 @@ static int __lb_setup(struct net_device *ndev,static int __lb_up (struct net_device *ndev,enum hnae_loop loop_mode) { +#define NIC_LB_TEST_WAIT_PHY_LINK_TIME 300struct hns_nic_priv *priv =netdev_priv (ndev);struct hnae_handle *h = priv->ae_handle;int speed, duplex;
@@ -389,6 +390,9 @@ static int __lb_up(struct net_device *ndev, h->dev->ops->adjust_link (h, speed, duplex); +/* wait adjust link done and phy ready */ +msleep (NIC_LB_TEST_WAIT_PHY_LINK_TIME ); +return 0 ; }
drivers/net/team/team.c +1 -1
@@ -2091,12 +2091,12 @@ static void team_setup(struct net_device *dev) dev->features |=NETIF_F_NETNS_LOCAL ; dev->hw_features =TEAM_VLAN_FEATURES | -NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_CTAG_FILTER ; dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM ); dev->features |= dev->hw_features; + dev->features |=NETIF_F_HW_VLAN_CTAG_TX ; } static int team_newlink(struct net *src_net, struct net_device *dev,
drivers/parport/share.c +2 -0
@@ -892,6 +892,7 @@ parport_register_dev_model(struct parport *port, const char *name, par_dev->devmodel = true; ret =device_register (&par_dev->dev);if (ret) { +kfree (par_dev->state);put_device (&par_dev->dev); goto err_put_port; }
@@ -909,6 +910,7 @@ parport_register_dev_model(struct parport *port, const char *name,spin_unlock (&port->physport->pardevice_lock);pr_debug ("%s: cannot grant exclusive access for device %s\n" , port->name, name); +kfree (par_dev->state);device_unregister (&par_dev->dev); goto err_put_port; }
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -2112,7 +2112,7 @@ static void qeth_bridgeport_an_set_cb(void *priv, l2entry = (struct qdio_brinfo_entry_l2 *)entry; code =IPA_ADDR_CHANGE_CODE_MACADDR ; -if (l2entry->addr_lnid.lnid) +if (l2entry->addr_lnid.lnid <VLAN_N_VID ) code |=IPA_ADDR_CHANGE_CODE_VLANID ; qeth_bridge_emit_host_event(card, anev_reg_unreg, code, (struct net_if_token *)&l2entry->nit,
drivers/scsi/hpsa.c +6 -1
@@ -4562,7 +4562,7 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg->reserved[0 ] =0 ; curr_sg->reserved[1 ] =0 ; curr_sg->reserved[2 ] =0 ; - curr_sg->chain_indicator =0x80 ; + curr_sg->chain_indicator =IOACCEL2_CHAIN ; curr_sg = h->ioaccel2_cmd_sg_list[c->cmdindex]; }
@@ -4579,6 +4579,11 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg++; } +/* +* Set the last s/g element bit +*/ + (curr_sg -1 )->chain_indicator =IOACCEL2_LAST_SG ; +switch (cmd->sc_data_direction) {case DMA_TO_DEVICE : cp->direction &= ~IOACCEL2_DIRECTION_MASK ;
drivers/scsi/hpsa_cmd.h +1 -0
@@ -513,6 +513,7 @@ struct ioaccel2_sg_element {u8 reserved[3 ];u8 chain_indicator;#define IOACCEL2_CHAIN 0x80 +#define IOACCEL2_LAST_SG 0x40 };/*
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -853,7 +853,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)memcpy (&query_res->upiu_res, &lrbp->ucd_rsp_ptr->qr,QUERY_OSF_SIZE );/* Get the descriptor */ -if (lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) { +if (hba->dev_cmd.query.descriptor && + lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) {u8 *descp = (u8 *)lrbp->ucd_rsp_ptr +GENERAL_UPIU_REQUEST_SIZE ;u16 resp_len;
drivers/scsi/vmw_pvscsi.c +4 -2
@@ -733,6 +733,7 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmndstruct pvscsi_adapter *adapter =shost_priv (host);struct pvscsi_ctx *ctx;unsigned long flags; +unsigned char op;spin_lock_irqsave (&adapter->hw_lock, flags);
@@ -745,13 +746,14 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd } cmd->scsi_done = done; + op = cmd->cmnd[0 ];dev_dbg (&cmd->device->sdev_gendev, -"queued cmd %p, ctx %p, op=%x\n" , cmd, ctx, cmd->cmnd[0 ]); +"queued cmd %p, ctx %p, op=%x\n" , cmd, ctx, op);spin_unlock_irqrestore (&adapter->hw_lock, flags); -pvscsi_kick_io (adapter, cmd->cmnd[0 ]); +pvscsi_kick_io (adapter, op);return 0 ; }
drivers/spi/spi-bitbang.c +1 -1
@@ -392,7 +392,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)if (ret)spi_master_put (master); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (spi_bitbang_start);
drivers/staging/rdma/hfi1/chip.c +1 -0
@@ -5906,6 +5906,7 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd)/* disable the port */ clear_rcvctrl (dd,RCV_CTRL_RCV_PORT_ENABLE_SMASK ); +cancel_work_sync (&ppd->freeze_work); }static inline int init_cpu_counters (struct hfi1_devdata *dd)
drivers/tty/rocket.c +1 -1
@@ -279,7 +279,7 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1module_param_array (pc104_4, ulong,NULL ,0 );MODULE_PARM_DESC (pc104_4,"set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,..." ); -static int rp_init (void ); +static int __init rp_init (void );static void rp_cleanup_module (void );module_init (rp_init);
drivers/usb/chipidea/udc.c +20 -0
@@ -1614,6 +1614,25 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)static int ci_udc_start (struct usb_gadget *gadget,struct usb_gadget_driver *driver);static int ci_udc_stop (struct usb_gadget *gadget); + +/* Match ISOC IN from the highest endpoint */ +static struct usb_ep *ci_udc_match_ep (struct usb_gadget *gadget, +struct usb_endpoint_descriptor *desc, +struct usb_ss_ep_comp_descriptor *comp_desc) +{ + struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget); +struct usb_ep *ep; + +if (usb_endpoint_xfer_isoc (desc) &&usb_endpoint_dir_in (desc)) { +list_for_each_entry_reverse (ep, &ci->gadget.ep_list, ep_list) { +if (ep->caps.dir_in && !ep->claimed) +return ep; + } + } + +return NULL ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -1627,6 +1646,7 @@ static const struct usb_gadget_ops usb_gadget_ops = { .vbus_draw = ci_udc_vbus_draw, .udc_start = ci_udc_start, .udc_stop = ci_udc_stop, + .match_ep = ci_udc_match_ep, };static int init_eps (struct ci_hdrc *ci)
drivers/usb/gadget/udc/fusb300_udc.c +5 -0
@@ -1345,12 +1345,15 @@ static const struct usb_gadget_ops fusb300_gadget_ops = {static int fusb300_remove (struct platform_device *pdev) {struct fusb300 *fusb300 =platform_get_drvdata (pdev); +int i;usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300);return 0 ;
@@ -1494,6 +1497,8 @@ clean_up:if (fusb300->ep0_req)fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300); }if (reg)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -964,8 +964,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;
fs/9p/acl.c +1 -1
@@ -282,7 +282,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,switch (handler->flags) {case ACL_TYPE_ACCESS :if (acl) { -struct iattr iattr; +struct iattr iattr = {0 };struct posix_acl *old_acl = acl; retval =posix_acl_update_mode (inode, &iattr.ia_mode, &acl);
fs/binfmt_flat.c +7 -17
@@ -808,9 +808,14 @@ err:static int load_flat_shared_library (int id,struct lib_info *libs) { +/* +* This is a fake bprm struct; only the members "buf", "file" and +* "filename" are actually used. +*/ struct linux_binprm bprm;int res;char buf[16 ]; +loff_t pos =0 ;memset (&bprm,0 ,sizeof (bprm));
@@ -824,25 +829,10 @@ static int load_flat_shared_library(int id, struct lib_info *libs)if (IS_ERR (bprm.file))return res; - bprm.cred =prepare_exec_creds (); - res = -ENOMEM ; -if (!bprm.cred) - goto out; - -/* We don't really care about recalculating credentials at this point -* as we're past the point of no return and are dealing with shared -* libraries. -*/ - bprm.cred_prepared =1 ; - - res =prepare_binprm (&bprm); - -if (!IS_ERR_VALUE (res)) + res =kernel_read (bprm.file, pos, bprm.buf,BINPRM_BUF_SIZE ); +if (res >=0 ) res =load_flat_file (&bprm, libs, id,NULL ); -abort_creds (bprm.cred); - -out:allow_write_access (bprm.file);fput (bprm.file);
fs/btrfs/dev-replace.c +19 -10
@@ -495,18 +495,27 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, }btrfs_wait_ordered_roots (root->fs_info,-1 ); - trans =btrfs_start_transaction (root,0 ); -if (IS_ERR (trans)) { -mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); -return PTR_ERR (trans); +while (1 ) { + trans =btrfs_start_transaction (root,0 ); +if (IS_ERR (trans)) { +mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); +return PTR_ERR (trans); + } + ret =btrfs_commit_transaction (trans, root); +WARN_ON (ret); +mutex_lock (&uuid_mutex); +/* keep away write_all_supers() during the finishing procedure */ +mutex_lock (&root->fs_info->fs_devices->device_list_mutex); +mutex_lock (&root->fs_info->chunk_mutex); +if (src_device->has_pending_chunks) { +mutex_unlock (&root->fs_info->chunk_mutex); +mutex_unlock (&root->fs_info->fs_devices->device_list_mutex); +mutex_unlock (&uuid_mutex); + }else { +break ; + } } - ret =btrfs_commit_transaction (trans, root); -WARN_ON (ret); -mutex_lock (&uuid_mutex); -/* keep away write_all_supers() during the finishing procedure */ -mutex_lock (&root->fs_info->fs_devices->device_list_mutex); -mutex_lock (&root->fs_info->chunk_mutex);btrfs_dev_replace_lock (dev_replace); dev_replace->replace_state = scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
fs/btrfs/reada.c +7 -0
@@ -762,16 +762,23 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info)u64 total =0 ;int i; +again:do { enqueued =0 ; +mutex_lock (&fs_devices->device_list_mutex);list_for_each_entry (device, &fs_devices->devices, dev_list) {if (atomic_read (&device->reada_in_flight) <MAX_IN_FLIGHT ) enqueued +=reada_start_machine_dev (fs_info, device); } +mutex_unlock (&fs_devices->device_list_mutex); total += enqueued; }while (enqueued && total <10000 ); +if (fs_devices->seed) { + fs_devices = fs_devices->seed; + goto again; + }if (enqueued ==0 )return ;
fs/btrfs/volumes.c +2 -0
@@ -4760,6 +4760,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,for (i =0 ; i < map->num_stripes; i++) { num_bytes = map->stripes[i].dev->bytes_used + stripe_size;btrfs_device_set_bytes_used (map->stripes[i].dev, num_bytes); + map->stripes[i].dev->has_pending_chunks = true; }spin_lock (&extent_root->fs_info->free_chunk_lock);
@@ -7064,6 +7065,7 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,for (i =0 ; i < map->num_stripes; i++) { dev = map->stripes[i].dev; dev->commit_bytes_used = dev->bytes_used; + dev->has_pending_chunks = false; } }unlock_chunks (root);
fs/btrfs/volumes.h +5 -0
@@ -62,6 +62,11 @@ struct btrfs_device {spinlock_t io_lock____cacheline_aligned ;int running_pending; +/* When true means this device has pending chunk alloc in +* current transaction. Protected by chunk_mutex. +*/ +bool has_pending_chunks; +/* regular prio bios */ struct btrfs_pending_bios pending_bios;/* WRITE_SYNC bios */
fs/cifs/smb2maperror.c +1 -1
@@ -455,7 +455,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { {STATUS_FILE_INVALID, -EIO, "STATUS_FILE_INVALID"}, {STATUS_ALLOTTED_SPACE_EXCEEDED, -EIO, "STATUS_ALLOTTED_SPACE_EXCEEDED"}, - {STATUS_INSUFFICIENT_RESOURCES, -EREMOTEIO, + {STATUS_INSUFFICIENT_RESOURCES, -EAGAIN, "STATUS_INSUFFICIENT_RESOURCES"}, {STATUS_DFS_EXIT_PATH_FOUND, -EIO, "STATUS_DFS_EXIT_PATH_FOUND"}, {STATUS_DEVICE_DATA_ERROR, -EIO, "STATUS_DEVICE_DATA_ERROR"},
fs/overlayfs/inode.c +13 -0
@@ -9,6 +9,7 @@#include <linux/fs.h> #include <linux/slab.h> +#include <linux/cred.h> #include <linux/xattr.h> #include "overlayfs.h"
@@ -91,6 +92,7 @@ int ovl_permission(struct inode *inode, int mask)struct ovl_entry *oe;struct dentry *alias =NULL ;struct inode *realinode; +const struct cred *old_cred;struct dentry *realdentry;bool is_upper;int err;
@@ -143,7 +145,18 @@ int ovl_permission(struct inode *inode, int mask) goto out_dput; } +/* +* Check overlay inode with the creds of task and underlying inode +* with creds of mounter +*/ + err =generic_permission (inode, mask); +if (err) + goto out_dput; + + old_cred =ovl_override_creds (inode->i_sb); err =__inode_permission (realinode, mask); +revert_creds (old_cred); + out_dput:dput (alias);return err;
include/asm-generic/bug.h +1 -0
@@ -47,6 +47,7 @@ struct bug_entry {#ifndef HAVE_ARCH_BUG #define BUG () do { \ printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ + barrier_before_unreachable(); \ panic("BUG!"); \ } while (0)#endif
include/linux/compiler-gcc.h +14 -1
@@ -206,6 +206,15 @@#endif /* GCC_VERSION >= 40300 */ #if GCC_VERSION >=40500 +/* +* calling noreturn functions, __builtin_unreachable() and __builtin_trap() +* confuse the stack allocation in gcc, leading to overly large stack +* frames, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82365 +* +* Adding an empty inline assembly before it works around the problem +*/ +#define barrier_before_unreachable () asm volatile("") +/* * Mark a position in code as unreachable. This can be used to * suppress control flow warnings after asm blocks that transfer
@@ -215,7 +224,11 @@* this in the preprocessor, but we can live with this because they're * unreleased. Really, we need to have autoconf for the kernel. */ -#define unreachable () __builtin_unreachable() +#define unreachable () \ + do { \ + barrier_before_unreachable(); \ + __builtin_unreachable(); \ + } while (0)/* Mark a function definition as prohibited from being cloned. */ #define __noclone __attribute__((__noclone__, __optimize__("no-tracer")))
include/linux/compiler.h +5 -0
@@ -175,6 +175,11 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);# define barrier_data (ptr) barrier()#endif +/* workaround for GCC PR82365 if needed */ +#ifndef barrier_before_unreachable +# define barrier_before_unreachable () do { } while (0) +#endif +/* Unreachable code */ #ifndef unreachable# define unreachable () do { } while (1)
include/linux/swiotlb.h +3 -0
@@ -1,10 +1,13 @@#ifndef __LINUX_SWIOTLB_H#define __LINUX_SWIOTLB_H +#include <linux/dma-direction.h> +#include <linux/init.h> #include <linux/types.h> struct device ;struct dma_attrs ; +struct page ;struct scatterlist ;extern int swiotlb_force;
include/net/bluetooth/hci_core.h +3 -0
@@ -174,6 +174,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
include/net/busy_poll.h +1 -1
@@ -93,7 +93,7 @@ static inline bool sk_busy_loop(struct sock *sk, int nonblock) goto out; ops = napi->dev->netdev_ops; -if (!ops->ndo_busy_poll) +if (!ops || !ops->ndo_busy_poll) goto out; do {
kernel/cpu.c +3 -0
@@ -851,6 +851,9 @@ static int __init mitigations_parse_cmdline(char *arg) cpu_mitigations =CPU_MITIGATIONS_OFF ; else if (!strcmp(arg, "auto")) cpu_mitigations =CPU_MITIGATIONS_AUTO ; + else + pr_crit("Unsupported mitigations=%s, system may still be vulnerable\n", + arg);return 0 ; }
kernel/ptrace.c +1 -3
@@ -45,9 +45,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent,*/ static void ptrace_link (struct task_struct *child,struct task_struct *new_parent) { -rcu_read_lock (); -__ptrace_link (child, new_parent,__task_cred (new_parent)); -rcu_read_unlock (); +__ptrace_link (child, new_parent,current_cred ()); }/**
kernel/trace/trace.c +1 -5
@@ -7189,12 +7189,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) cnt++; -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (trace_find_next_entry_inc (&iter) !=NULL ) {int ret;
kernel/trace/trace.h +18 -0
@@ -1381,4 +1381,22 @@ static inline void trace_event_enum_update(struct trace_enum_map **map, int len)extern struct trace_iterator *tracepoint_print_iter; +/* +* Reset the state of the trace_iterator so that it can read consumed data. +* Normally, the trace_iterator is used for reading the data when it is not +* consumed, and must retain state. +*/ +static __always_inline void trace_iterator_reset(struct trace_iterator *iter) +{ +const size_t offset = offsetof(struct trace_iterator , seq); + +/* +* Keep gcc from complaining about overwriting more than just one +* member in the structure. +*/ +memset ((char *)iter + offset,0 ,sizeof (struct trace_iterator ) - offset); + + iter->pos =-1 ; +} +#endif /* _LINUX_KERNEL_TRACE_H */
kernel/trace/trace_kdb.c +1 -5
@@ -40,12 +40,8 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)kdb_printf ("Dumping ftrace buffer:\n" ); -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) {
lib/mpi/mpi-pow.c +2 -4
@@ -37,6 +37,7 @@int mpi_powm (MPI res,MPI base,MPI exp,MPI mod) {mpi_ptr_t mp_marker =NULL , bp_marker =NULL , ep_marker =NULL ; +struct karatsuba_ctx karactx = {};mpi_ptr_t xp_marker =NULL ;mpi_ptr_t tspace =NULL ;mpi_ptr_t rp, ep, mp, bp;
@@ -164,13 +165,11 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)int c;mpi_limb_t e;mpi_limb_t carry_limb; -struct karatsuba_ctx karactx; xp = xp_marker =mpi_alloc_limb_space (2 * (msize +1 ));if (!xp) goto enomem; -memset (&karactx,0 ,sizeof karactx); negative_result = (ep[0 ] &1 ) && base->sign; i = esize -1 ;
@@ -295,8 +294,6 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)if (mod_shift_cnt)mpihelp_rshift (rp, rp, rsize, mod_shift_cnt);MPN_NORMALIZE (rp, rsize); - -mpihelp_release_karatsuba_ctx (&karactx); }if (negative_result && rsize) {
@@ -313,6 +310,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) leave: rc =0 ; enomem: +mpihelp_release_karatsuba_ctx (&karactx);if (assign_rp)mpi_assign_limb_space (res, rp, size);if (mp_marker)
mm/page_idle.c +2 -2
@@ -130,7 +130,7 @@ static ssize_t page_idle_bitmap_read(struct file *file, struct kobject *kobj, end_pfn = pfn + count *BITS_PER_BYTE ;if (end_pfn > max_pfn) - end_pfn =ALIGN (max_pfn,BITMAP_CHUNK_BITS ); + end_pfn = max_pfn;for (; pfn < end_pfn; pfn++) { bit = pfn %BITMAP_CHUNK_BITS ;
@@ -175,7 +175,7 @@ static ssize_t page_idle_bitmap_write(struct file *file, struct kobject *kobj, end_pfn = pfn + count *BITS_PER_BYTE ;if (end_pfn > max_pfn) - end_pfn =ALIGN (max_pfn,BITMAP_CHUNK_BITS ); + end_pfn = max_pfn;for (; pfn < end_pfn; pfn++) { bit = pfn %BITMAP_CHUNK_BITS ;
net/9p/protocol.c +9 -3
@@ -622,13 +622,19 @@ int p9dirent_read(struct p9_client *clnt, char *buf, int len,if (ret) {p9_debug (P9_DEBUG_9P ,"<<< p9dirent_read failed: %d\n" , ret);trace_9p_protocol_dump (clnt, &fake_pdu); - goto out; +return ret; } -strcpy (dirent->d_name, nameptr); + ret =strscpy (dirent->d_name, nameptr,sizeof (dirent->d_name)); +if (ret <0 ) { +p9_debug (P9_DEBUG_ERROR , +"On the wire dirent name too long: %s\n" , + nameptr); +kfree (nameptr); +return ret; + }kfree (nameptr); -out:return fake_pdu.offset; }EXPORT_SYMBOL (p9dirent_read);
net/9p/trans_common.c +1 -0
@@ -14,6 +14,7 @@#include <linux/mm.h> #include <linux/module.h> +#include "trans_common.h" /** * p9_release_req_pages - Release pages after the transaction.
net/9p/trans_rdma.c +3 -4
@@ -255,8 +255,7 @@ p9_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)case RDMA_CM_EVENT_DISCONNECTED :if (rdma) rdma->state =P9_RDMA_CLOSED ; -if (c) - c->status = Disconnected; + c->status = Disconnected;break ;case RDMA_CM_EVENT_TIMEWAIT_EXIT :
@@ -476,7 +475,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) err =post_recv (client, rpl_context);if (err) { -p9_debug (P9_DEBUG_FCALL ,"POST RECV failed\n" ); +p9_debug (P9_DEBUG_ERROR ,"POST RECV failed: %d\n" , err); goto recv_error; }/* remove posted receive buffer from request structure */
@@ -544,7 +543,7 @@ dont_need_post_recv: recv_error:kfree (rpl_context);spin_lock_irqsave (&rdma->req_lock, flags); -if (rdma->state <P9_RDMA_CLOSING ) { +if (err != -EINTR && rdma->state <P9_RDMA_CLOSING ) { rdma->state =P9_RDMA_CLOSING ;spin_unlock_irqrestore (&rdma->req_lock, flags);rdma_disconnect (rdma->cm_id);
net/bluetooth/hci_conn.c +9 -1
@@ -1293,8 +1293,16 @@ auth:return 0 ; encrypt: -if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) +if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) { +/* Ensure that the encryption key size has been read, +* otherwise stall the upper layer responses. +*/ +if (!conn->enc_key_size) +return 0 ; + +/* Nothing else needed, all requirements are met */ return 1 ; + }hci_conn_encrypt (conn);return 0 ;
net/bluetooth/l2cap_core.c +28 -5
@@ -1329,6 +1329,21 @@ static void l2cap_request_info(struct l2cap_conn *conn) sizeof(req), &req); } +static bool l2cap_check_enc_key_size (struct hci_conn *hcon) +{ +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +* +* This check might also be called for unencrypted connections +* that have no key size requirements. Ensure that the link is +* actually encrypted before enforcing a key size. +*/ +return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || + hcon->enc_key_size >=HCI_MIN_ENC_KEY_SIZE ); +} +static void l2cap_do_start (struct l2cap_chan *chan) {struct l2cap_conn *conn = chan->conn;
@@ -1346,9 +1361,14 @@ static void l2cap_do_start(struct l2cap_chan *chan)if (!(conn->info_state &L2CAP_INFO_FEAT_MASK_REQ_DONE ))return ; -if (l2cap_chan_check_security (chan, true) && -__l2cap_no_conn_pending (chan)) +if (!l2cap_chan_check_security (chan, true) || + !__l2cap_no_conn_pending (chan)) +return ; + +if (l2cap_check_enc_key_size (conn->hcon))l2cap_start_connection (chan); +else +__set_chan_timer (chan,L2CAP_DISC_TIMEOUT ); }static inline int l2cap_mode_supported (__u8 mode,__u32 feat_mask)
@@ -1427,7 +1447,10 @@ static void l2cap_conn_start(struct l2cap_conn *conn)continue ; } -l2cap_start_connection (chan); +if (l2cap_check_enc_key_size (conn->hcon)) +l2cap_start_connection (chan); +else +l2cap_chan_close (chan,ECONNREFUSED ); }else if (chan->state ==BT_CONNECT2 ) {struct l2cap_conn_rsp rsp;
@@ -7432,7 +7455,7 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) }if (chan->state ==BT_CONNECT ) { -if (!status) +if (!status &&l2cap_check_enc_key_size (hcon))l2cap_start_connection (chan);else __set_chan_timer (chan,L2CAP_DISC_TIMEOUT );
@@ -7441,7 +7464,7 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)struct l2cap_conn_rsp rsp;__u16 res, stat; -if (!status) { +if (!status &&l2cap_check_enc_key_size (hcon)) {if (test_bit (FLAG_DEFER_SETUP , &chan->flags)) { res =L2CAP_CR_PEND ; stat =L2CAP_CS_AUTHOR_PEND ;
net/can/af_can.c +1 -0
@@ -113,6 +113,7 @@ EXPORT_SYMBOL(can_ioctl);static void can_sock_destruct (struct sock *sk) {skb_queue_purge (&sk->sk_receive_queue); +skb_queue_purge (&sk->sk_error_queue); }static const struct can_proto *can_get_proto (int protocol)
net/ipv4/raw.c +1 -1
@@ -195,7 +195,7 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash) } sk =__raw_v4_lookup (net,sk_next (sk), iph->protocol, iph->saddr, iph->daddr, - skb->dev->ifindex); + dif); } out:read_unlock (&raw_v4_hashinfo.lock);
net/mac80211/rx.c +2 -0
@@ -3324,6 +3324,8 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)case NL80211_IFTYPE_STATION :if (!bssid && !sdata->u.mgd.use_4addr)return false; +if (ieee80211_is_robust_mgmt_frame (skb) && !rx->sta) +return false;if (multicast)return true;return ether_addr_equal (sdata->vif.addr, hdr->addr1);
net/sctp/endpointola.c +4 -4
@@ -126,10 +126,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,/* Initialize the bind addr area */ sctp_bind_addr_init (&ep->base.bind_addr,0 ); -/* Remember who we are attached to. */ - ep->base.sk = sk; -sock_hold (ep->base.sk); -/* Create the lists of associations. */ INIT_LIST_HEAD (&ep->asocs);
@@ -165,6 +161,10 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, ep->auth_hmacs_list = auth_hmacs; ep->auth_chunk_list = auth_chunks; +/* Remember who we are attached to. */ + ep->base.sk = sk; +sock_hold (ep->base.sk); +return ep; nomem_hmacs:
net/tipc/core.c +6 -6
@@ -129,7 +129,7 @@ static int __init tipc_init(void)if (err) goto out_sysctl; - err =register_pernet_subsys (&tipc_net_ops); + err =register_pernet_device (&tipc_net_ops);if (err) goto out_pernet;
@@ -137,7 +137,7 @@ static int __init tipc_init(void)if (err) goto out_socket; - err =register_pernet_subsys (&tipc_topsrv_net_ops); + err =register_pernet_device (&tipc_topsrv_net_ops);if (err) goto out_pernet_topsrv;
@@ -148,11 +148,11 @@ static int __init tipc_init(void)pr_info ("Started in single node mode\n" );return 0 ; out_bearer: -unregister_pernet_subsys (&tipc_topsrv_net_ops); +unregister_pernet_device (&tipc_topsrv_net_ops); out_pernet_topsrv:tipc_socket_stop (); out_socket: -unregister_pernet_subsys (&tipc_net_ops); +unregister_pernet_device (&tipc_net_ops); out_pernet:tipc_unregister_sysctl (); out_sysctl:
@@ -167,9 +167,9 @@ out_netlink: static void __exit tipc_exit(void) {tipc_bearer_cleanup (); -unregister_pernet_subsys (&tipc_topsrv_net_ops); +unregister_pernet_device (&tipc_topsrv_net_ops);tipc_socket_stop (); -unregister_pernet_subsys (&tipc_net_ops); +unregister_pernet_device (&tipc_net_ops);tipc_netlink_stop ();tipc_netlink_compat_stop ();tipc_unregister_sysctl ();
net/tipc/netlink_compat.c +15 -3
@@ -430,7 +430,11 @@ static int tipc_nl_compat_bearer_disable(struct tipc_nl_compat_cmd_doit *cmd,if (!bearer)return -EMSGSIZE ; - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_BEARER_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
@@ -505,7 +509,11 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg, name = (char *)TLV_DATA (msg->req); - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_LINK_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
@@ -776,7 +784,11 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit *cmd,if (!link)return -EMSGSIZE ; - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_LINK_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
net/wireless/core.c +1 -1
@@ -447,7 +447,7 @@ use_default_name: &rdev->rfkill_ops, rdev);if (!rdev->rfkill) { -kfree (rdev); +wiphy_free (&rdev->wiphy);return NULL ; }
scripts/checkstack.pl +1 -1
@@ -45,7 +45,7 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $x = "[0-9a-f]"; # hex character $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; - if ($arch eq 'aarch64') { + if ($arch =~ '^(aarch|arm)64$') { #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') {
security/apparmor/policy_unpack.c +1 -1
@@ -177,7 +177,7 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name)char *tag =NULL ;size_t size =unpack_u16_chunk (e, &tag);/* if a name is specified it must match. otherwise skip tag */ -if (name && (!size ||strcmp (name, tag))) +if (name && (!size || tag[size-1 ] !='\0' ||strcmp (name, tag))) goto fail; }else if (name) {/* if a name is specified and there is no name tag fail */
sound/core/seq/oss/seq_oss_ioctl.c +1 -1
@@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct seq_oss_devinfo *dp, void __user *arg)if (copy_from_user (ev, arg,8 ))return -EFAULT ;memset (&tmpev,0 ,sizeof (tmpev)); -snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.client, dp->addr.port); tmpev.time.tick =0 ;if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev)) {snd_seq_oss_dispatch (dp, &tmpev,0 ,0 );
sound/core/seq/oss/seq_oss_rw.c +1 -1
@@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)memset (&event,0 ,sizeof (event));/* set dummy -- to be sure */ event.type =SNDRV_SEQ_EVENT_NOTEOFF ; -snd_seq_oss_fill_addr (dp, &event, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &event, dp->addr.client, dp->addr.port);if (snd_seq_oss_process_event (dp, rec, &event))return 0 ;/* invalid event - no need to insert queue */
sound/firewire/amdtp-am824.c +1 -1
@@ -388,7 +388,7 @@ static void read_midi_messages(struct amdtp_stream *s,u8 *b;for (f =0 ; f < frames; f++) { - port = (s->data_block_counter + f) %8 ; + port = (8 - s->tx_first_dbc + s->data_block_counter + f) %8 ; b = (u8 *)&buffer[p->midi_position]; len = b[0 ] -0x80 ;
sound/soc/codecs/cs4265.c +1 -1
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = {static bool cs4265_readable_register (struct device *dev,unsigned int reg) {switch (reg) { - case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2: + case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:return true;default :return false;
sound/soc/codecs/max98090.c +16 -0
@@ -1924,6 +1924,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090,return 0 ; } +static int max98090_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct max98090_priv *max98090 =snd_soc_component_get_drvdata (component); +unsigned int fmt = max98090->dai_fmt; + +/* Remove 24-bit format support if it is not in right justified mode. */ +if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_RIGHT_J ) { + substream->runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (substream->runtime,0 ,16 ,16 ); + } +return 0 ; +} +static int max98090_dai_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -2331,6 +2346,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect);#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot,
sound/usb/mixer_quirks.c +2 -2
@@ -753,7 +753,7 @@ static int snd_ni_control_init_val(struct usb_mixer_interface *mixer,return err; } - kctl->private_value |= (value <<24 ); + kctl->private_value |= ((unsigned int )value <<24 );return 0 ; }
@@ -914,7 +914,7 @@ static int snd_ftu_eff_switch_init(struct usb_mixer_interface *mixer,if (err <0 )return err; - kctl->private_value |= value[0 ] <<24 ; + kctl->private_value |= (unsigned int )value[0 ] <<24 ;return 0 ; }
tools/perf/builtin-help.c +1 -1
@@ -179,7 +179,7 @@ static void add_man_viewer(const char *name)while (*p) p = &((*p)->next); *p =zalloc (sizeof (**p) + len +1 ); -strncpy ((*p)->name, name, len); +strcpy ((*p)->name, name); }static int supported_man_viewer (const char *name,size_t len)
tools/perf/ui/tui/helpline.c +1 -1
@@ -23,7 +23,7 @@ static void tui_helpline__push(const char *msg)SLsmg_set_color (0 );SLsmg_write_nstring ((char *)msg, SLtt_Screen_Cols);SLsmg_refresh (); -strncpy (ui_helpline__current, msg, sz)[sz -1 ] ='\0' ; +strlcpy (ui_helpline__current, msg, sz); }static int tui_helpline__show (const char *format,va_list ap)