Linux 4.1.17
Greg KH
maintainerI'm announcing the release of the 4.1.17 kernel.
All users of the 4.1 kernel series must upgrade.
The updated 4.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.1.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/kvm/mmu.c | 15 - arch/arm/net/bpf_jit_32.c | 16 -- arch/arm64/include/asm/kvm_emulate.h | 8 - arch/arm64/kernel/ptrace.c | 6 arch/arm64/kernel/setup.c | 4 arch/arm64/kernel/suspend.c | 10 + arch/arm64/kvm/inject_fault.c | 2 arch/arm64/mm/mmu.c | 3 arch/arm64/net/bpf_jit.h | 3 arch/arm64/net/bpf_jit_comp.c | 54 ++++--- arch/mips/net/bpf_jit.c | 16 -- arch/mn10300/Kconfig | 4 arch/powerpc/include/asm/cmpxchg.h | 16 +- arch/powerpc/include/asm/reg.h | 1 arch/powerpc/include/asm/synch.h | 2 arch/powerpc/include/uapi/asm/elf.h | 2 arch/powerpc/kernel/module_64.c | 27 +++ arch/powerpc/kernel/process.c | 18 ++ arch/powerpc/kernel/signal_32.c | 14 + arch/powerpc/kernel/signal_64.c | 4 arch/powerpc/kvm/book3s_hv.c | 6 arch/powerpc/net/bpf_jit_comp.c | 13 - arch/powerpc/platforms/powernv/opal.c | 2 arch/sparc/net/bpf_jit_comp.c | 17 -- arch/x86/include/asm/boot.h | 2 arch/x86/include/asm/mmu_context.h | 34 ++++ arch/x86/kernel/reboot.c | 8 + arch/x86/kernel/signal.c | 17 +- arch/x86/kvm/svm.c | 14 - arch/x86/kvm/trace.h | 2 arch/x86/kvm/vmx.c | 19 +- arch/x86/kvm/x86.c | 11 - arch/x86/mm/mpx.c | 6 arch/x86/mm/tlb.c | 29 +++ arch/x86/xen/suspend.c | 3 drivers/char/ipmi/ipmi_si_intf.c | 81 ++++++---- drivers/connector/connector.c | 11 - drivers/hid/hid-core.c | 2 drivers/iommu/intel-iommu.c | 9 - drivers/isdn/i4l/isdn_ppp.c | 12 + drivers/media/platform/vivid/vivid-osd.c | 1 drivers/media/usb/airspy/airspy.c | 2 drivers/net/bonding/bond_main.c | 5 drivers/net/ppp/ppp_generic.c | 6 drivers/net/slip/slhc.c | 12 + drivers/net/slip/slip.c | 2 drivers/net/team/team.c | 6 drivers/net/usb/cdc_mbim.c | 2 drivers/net/usb/cdc_ncm.c | 31 ++++ drivers/net/veth.c | 6 drivers/net/vxlan.c | 12 + drivers/net/xen-netback/netback.c | 7 drivers/net/xen-netfront.c | 21 +- drivers/parisc/iommu-helpers.h | 15 + drivers/staging/lustre/lustre/obdecho/echo_client.c | 20 +- drivers/usb/core/hub.c | 22 ++ drivers/usb/host/xhci.c | 12 + drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ipaq.c | 3 drivers/xen/gntdev.c | 2 fs/direct-io.c | 11 + include/linux/filter.h | 19 ++ include/linux/sched.h | 1 include/linux/skbuff.h | 3 include/linux/syscalls.h | 2 include/linux/types.h | 2 include/linux/usb/cdc_ncm.h | 1 include/net/inet_ecn.h | 19 ++ include/net/inet_timewait_sock.h | 14 + kernel/bpf/verifier.c | 10 + net/batman-adv/bridge_loop_avoidance.c | 10 - net/batman-adv/hard-interface.h | 12 - net/batman-adv/network-coding.c | 19 +- net/batman-adv/originator.c | 151 +++++++------------- net/batman-adv/originator.h | 1 net/batman-adv/translation-table.c | 28 +-- net/bridge/br_device.c | 8 + net/bridge/br_stp_if.c | 5 net/core/dev.c | 5 net/core/dst.c | 3 net/core/filter.c | 5 net/dccp/minisocks.c | 4 net/ipv4/inet_timewait_sock.c | 16 +- net/ipv4/ip_output.c | 3 net/ipv4/tcp_minisocks.c | 13 - net/ipv4/tcp_yeah.c | 2 net/ipv4/xfrm4_policy.c | 46 ++++-- net/ipv6/addrconf.c | 11 - net/ipv6/addrlabel.c | 2 net/ipv6/ip6_output.c | 2 net/ipv6/tcp_ipv6.c | 2 net/ipv6/xfrm6_mode_tunnel.c | 2 net/ipv6/xfrm6_policy.c | 53 +++++-- net/openvswitch/datapath.c | 5 net/phonet/af_phonet.c | 4 net/sched/sch_generic.c | 4 net/sctp/sm_sideeffect.c | 42 +++-- net/sctp/sm_statefuns.c | 6 net/sctp/socket.c | 3 net/sctp/sysctl.c | 2 net/unix/af_unix.c | 24 ++- net/unix/garbage.c | 13 + net/xfrm/xfrm_output.c | 2 net/xfrm/xfrm_policy.c | 38 ----- scripts/recordmcount.c | 24 +++ scripts/recordmcount.h | 2 scripts/recordmcount.pl | 3 sound/core/control.c | 2 sound/core/hrtimer.c | 3 sound/core/pcm_compat.c | 13 + sound/core/seq/seq_clientmgr.c | 2 sound/core/seq/seq_compat.c | 9 - sound/core/seq/seq_queue.c | 2 sound/core/timer.c | 100 ++++++++++--- sound/firewire/bebob/Makefile | 2 sound/firewire/dice/Makefile | 2 sound/firewire/fireworks/Makefile | 2 sound/firewire/oxfw/Makefile | 2 sound/pci/hda/hda_intel.c | 52 ++++++ sound/pci/hda/patch_realtek.c | 62 +++++++- sound/pci/hda/patch_sigmatel.c | 46 +++--- sound/pci/rme96.c | 41 +++-- sound/soc/codecs/arizona.c | 2 sound/soc/codecs/es8328.c | 25 ++- sound/soc/codecs/es8328.h | 1 sound/soc/codecs/wm8962.c | 4 sound/soc/codecs/wm8974.c | 1 sound/soc/davinci/davinci-mcasp.c | 4 sound/soc/sh/rcar/gen.c | 2 sound/soc/soc-compress.c | 23 ++- sound/usb/mixer.c | 2 sound/usb/mixer_maps.c | 12 - sound/usb/mixer_quirks.c | 39 +++++ sound/usb/mixer_quirks.h | 4 sound/usb/quirks.c | 2 136 files changed, 1199 insertions(+), 632 deletions(-)
Al Viro (2):
staging: lustre: echo_copy.._lsm() dereferences userland pointers directly fix the regression from "direct-io: Fix negative return from dio read beyond eof"
Alan Stern (1):
USB: fix invalid memory access in hub_activate()
Alexandra Yates (1):
ALSA: hda - Add Intel Lewisburg device IDs Audio
Andrey Ryabinin (1):
ipv6/addrlabel: fix ip6addrlbl_get()
Andy Lutomirski (2):
x86/mm: Add barriers and document switch_mm()-vs-flush synchronization x86/mm: Improve switch_mm() barrier comments
Anssi Hannula (2):
ALSA: usb-audio: Add a more accurate volume quirk for AudioQuest DragonFly
ALSA: usb-audio: Add sample rate inquiry quirk for AudioQuest DragonFly
Antti Palosaari (1):
airspy: increase USB control message buffer size
Ard Biesheuvel (2):
ARM/arm64: KVM: test properly for a PTE's uncachedness ARM/arm64: KVM: correct PTE uncachedness check
Arnd Bergmann (1):
arm64: fix building without CONFIG_UID16
Ben Hutchings (2):
isdn_ppp: Add checks for allocation failure in isdn_ppp_open() ppp, slip: Validate VJ compression slot parameters completely
Bjørn Mork (1):
net: cdc_ncm: avoid changing RX/TX buffers on MTU changes
Boqun Feng (2):
powerpc: Make value-returning atomics fully ordered
powerpc: Make {cmp}xchg* and their atomic_ versions fully ordered
Boris Ostrovsky (1):
xen/gntdev: Grant maps should not be subject to NUMA balancing
Chunfeng Yun (1):
usb: xhci: fix config fail of FS hub behind a HS hub with MTT
Corey Minyard (1):
ipmi: Start the timer and thread on internal msgs
Dan Carpenter (1):
USB: ipaq.c: fix a timeout loop
Dan Streetman (1):
xfrm: dst_entries_init() per-net dst_ops
Dave Hansen (1):
x86/mpx: Fix instruction decoder condition
David Henningsson (1):
ALSA: hda - Add inverted dmic for Packard Bell DOTS
David Woodhouse (1):
iommu/vt-d: Fix ATSR handling for Root-Complex integrated endpoints
Dmitry V. Levin (1):
x86/signal: Fix restart_syscall number for x32 tasks
Eric Dumazet (4):
ipv6: tcp: add rcu locking in tcp_v6_send_synack()
phonet: properly unshare skbs in phonet_rcv()
ipv6: update skb->csum when CE mark is propagated tcp/dccp: fix timewait races in timer handling
Florian Westphal (1):
connector: bump skb->users before callback invocation
Francesco Ruggeri (1):
net: possible use after free in dst_release
Greg Kroah-Hartman (1):
Linux 4.1.17
Guenter Roeck (1):
mn10300: Select CONFIG_HAVE_UID16 to fix build failure
H.J. Lu (1):
x86/boot: Double BOOT_HEAP_SIZE to 64KB
Hannes Frederic Sowa (1):
bridge: Only call /sbin/bridge-stp for the initial network namespace
Hui Wang (1):
ALSA: hda - fix the headset mic detection problem for a Dell laptop
Ido Schimmel (1):
team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
Jan Kara (1):
direct-io: Fix negative return from dio read beyond eof
Jan Stancek (1):
ipmi: move timer init to before irq is setup
Joe Jin (1):
xen-netfront: update num_queues to real created
John Blackwood (1):
arm64: Clear out any singlestep state on a ptrace detach operation
John Fastabend (1):
net: sched: fix missing free per cpu on qstats
John Keeping (1):
ASoC: es8328: Fix deemphasis values
Jurgen Kramer (1):
ALSA: usb: Add native DSD support for Oppo HA-1
Karl Heiss (2):
bonding: Prevent IPv6 link local address on enslaved devices
sctp: Prevent soft lockup when sctp_accept() is called during a timeout event
Konstantin Khlebnikov (1):
net: preserve IP control block during GSO segmentation
Kuninori Morimoto (1):
ASoC: rsnd: fixup SCU_SYS_INT_EN1 address
Li Bin (1):
recordmcount: arm64: Replace the ignored mcount call into nop
Lorenzo Pieralisi (1):
arm64: kernel: pause/unpause function graph tracer in cpu_suspend()
Mans Rullgard (1):
ASoC: wm8974: set cache type for regmap
Marc Zyngier (1):
arm64: KVM: Fix AArch32 to AArch64 register mapping
Mario Kleiner (2):
x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[]
ALSA: hda/realtek - Fix silent headphone output on MacPro 4,1 (v2)
Michael Neuling (2):
powerpc/tm: Block signal return setting invalid MSR state powerpc/tm: Check for already reclaimed tasks
Michal Kubeček (1):
udp: disallow UFO for sockets with SO_NO_CHECK option
Mikulas Patocka (1):
parisc iommu: fix panic due to trying to allocate too large region
Neal Cardwell (1):
tcp_yeah: don't set ssthresh below 2
Nicolas Boichat (2):
ALSA: seq: Fix snd_seq_call_port_info_ioctl in compat mode
ALSA: pcm: Fix snd_pcm_hw_params struct copy in compat mode
Nicolas Dichtel (1):
vxlan: fix test which detect duplicate vxlan iface
Nikesh Oswal (1):
ASoC: arizona: Fix bclk for sample rates that are multiple of 4kHz
Nikolay Aleksandrov (1):
bridge: fix lockdep addr_list_lock false positive splat
Oliver Freyermuth (1):
USB: cp210x: add ID for ELV Marble Sound Board 1
Oliver Neukum (1):
xhci: refuse loading if nousb is used
Ouyang Zhaowei (Charles) (1):
x86/xen: don't reset vcpu_info on a cancelled suspend
Paolo Bonzini (3):
KVM: svm: unconditionally intercept #DB
KVM: x86: expose MSR_TSC_AUX to userspace
KVM: x86: correctly print #AC in traces
Paul Mackerras (1):
KVM: PPC: Book3S HV: Prohibit setting illegal transaction state in MSR
Peter Ujfalusi (1):
ASoC: davinci-mcasp: Fix XDATA check in mcasp_start_tx
Raanan Avargil (1):
tcp/dccp: fix old style declarations
Rabin Vincent (2):
net: filter: make JITs zero A for SKF_AD_ALU_XOR_X
net: bpf: reject invalid shifts
Radim Krčmář (1):
KVM: VMX: fix SMEP and SMAP without EPT
Richard Purdie (1):
HID: core: Avoid uninitialized buffer access
Sachin Pandhare (1):
ASoC: wm8962: correct addresses for HPF_C_0/1
Salva Peiró (1):
media/vivid-osd: fix info leak in ioctl
Sasha Levin (1):
net: sctp: prevent writes to cookie_hmac_alg from accessing invalid memory
Stewart Smith (1):
powerpc/powernv: pr_warn_once on unsupported OPAL_MSG type
Sven Eckelmann (7):
batman-adv: Avoid recursive call_rcu for batadv_bla_claim
batman-adv: Avoid recursive call_rcu for batadv_nc_node
batman-adv: Drop immediate batadv_orig_ifinfo free function
batman-adv: Drop immediate batadv_neigh_node free function
batman-adv: Drop immediate neigh_ifinfo free function
batman-adv: Drop immediate batadv_hard_iface free function
batman-adv: Drop immediate orig_node free function
Takashi Iwai (22):
ALSA: hda - Disable 64bit address for Creative HDA controllers
ALSA: hda - Apply pin fixup for HP ProBook 6550b
ALSA: hda - Apply HP headphone fixups more generically
ALSA: hda - Add fixup for Acer Aspire One Cloudbook 14
ALSA: hda - Fix noise on Gigabyte Z170X mobo
ALSA: rme96: Fix unexpected volume reset after rate changes
ALSA: hda - Fix noise problems on Thinkpad T440s
ALSA: hda - Add a fixup for Thinkpad X1 Carbon 2nd
ALSA: hda - Apply click noise workaround for Thinkpads generically
ALSA: hda - Set codec to D3 at reboot/shutdown on Thinkpads
ALSA: seq: Fix missing NULL check at remove_events ioctl
ALSA: seq: Fix race at timer setup and close
ALSA: hda - Fix white noise on Dell Latitude E5550
ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
ALSA: timer: Harden slave timer list handling
ALSA: timer: Fix race among timer ioctls
ALSA: timer: Fix double unlink of active_list
ALSA: hrtimer: Fix stall by hrtimer_cancel()
ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0
ALSA: hda - Fix bass pin fixup for ASUS N550JX
ALSA: hda - Flush the pending probe work at remove
ALSA: timer: Handle disconnection more safely
Takashi Sakamoto (1):
ALSA: fireworks/bebob/oxfw/dice: enable to make as built-in
Ulrich Weigand (2):
scripts/recordmcount.pl: support data in text section on powerpc powerpc/module: Handle R_PPC64_ENTRY relocations
Vijay Pandurangan (1):
veth: don’t modify ip_summed; doing so treats packets with bad checksums as good.
Vinod Koul (1):
ASoC: compress: Fix compress device direction check
WANG Cong (1):
addrconf: always initialize sysctl table data
Wei Liu (2):
xen-netback: respect user provided max_queues
xen-netfront: respect user provided max_queues
Will Deacon (1):
arm64: mm: ensure that the zero page is visible to the page table walker
Xin Long (1):
sctp: sctp should release assoc when sctp_make_abort_user return NULL in sctp_close
Xiong Zhang (1):
ALSA: hda - Set SKL+ hda controller power at freeze() and thaw()
Yang Shi (1):
arm64: restore bogomips information in /proc/cpuinfo
Zi Shen Lim (2):
arm64: bpf: fix div-by-zero case
arm64: bpf: fix mod-by-zero case
libin (1):
recordmcount: Fix endianness handling bug for nop_mcount
willy tarreau (1):
unix: properly account for FDs passed over unix sockets
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 1 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Series 4800
arch/arm/kvm/mmu.c +7 -8
@@ -98,6 +98,11 @@ static void kvm_flush_dcache_pud(pud_t pud)__kvm_flush_dcache_pud (pud); } +static bool kvm_is_device_pfn (unsigned long pfn) +{ +return !pfn_valid (pfn); +} +/** * stage2_dissolve_pmd() - clear and flush huge PMD entry * @kvm: pointer to kvm structure.
@@ -213,7 +218,7 @@ static void unmap_ptes(struct kvm *kvm, pmd_t *pmd,kvm_tlb_flush_vmid_ipa (kvm, addr);/* No need to invalidate the cache for device mappings */ -if ((pte_val (old_pte) &PAGE_S2_DEVICE ) !=PAGE_S2_DEVICE ) +if (!kvm_is_device_pfn (pte_pfn (old_pte)))kvm_flush_dcache_pte (old_pte);put_page (virt_to_page (pte));
@@ -305,8 +310,7 @@ static void stage2_flush_ptes(struct kvm *kvm, pmd_t *pmd, pte =pte_offset_kernel (pmd, addr);do { -if (!pte_none (*pte) && - (pte_val (*pte) &PAGE_S2_DEVICE ) !=PAGE_S2_DEVICE ) +if (!pte_none (*pte) && !kvm_is_device_pfn (pte_pfn (*pte)))kvm_flush_dcache_pte (*pte); }while (pte++, addr +=PAGE_SIZE , addr != end); }
@@ -1037,11 +1041,6 @@ static bool kvm_is_write_fault(struct kvm_vcpu *vcpu)return kvm_vcpu_dabt_iswrite (vcpu); } -static bool kvm_is_device_pfn (unsigned long pfn) -{ -return !pfn_valid (pfn); -} -/** * stage2_wp_ptes - write protect PMD range * @pmd: pointer to pmd entry
arch/arm/net/bpf_jit_32.c +1 -15
@@ -162,19 +162,6 @@ static inline int mem_words_used(struct jit_ctx *ctx)return fls (ctx->seen &SEEN_MEM ); } -static inline bool is_load_to_a (u16 inst) -{ -switch (inst) { -case BPF_LD |BPF_W |BPF_LEN : -case BPF_LD |BPF_W |BPF_ABS : -case BPF_LD |BPF_H |BPF_ABS : -case BPF_LD |BPF_B |BPF_ABS : -return true; -default : -return false; - } -} -static void jit_fill_hole (void *area,unsigned int size) {u32 *ptr;
@@ -186,7 +173,6 @@ static void jit_fill_hole(void *area, unsigned int size)static void build_prologue (struct jit_ctx *ctx) {u16 reg_set =saved_regs (ctx); -u16 first_inst = ctx->skf->insns[0 ].code;u16 off;#ifdef CONFIG_FRAME_POINTER
@@ -216,7 +202,7 @@ static void build_prologue(struct jit_ctx *ctx)emit (ARM_MOV_I (r_X,0 ), ctx);/* do not leak kernel data to userspace */ -if ((first_inst != (BPF_RET |BPF_K )) && !(is_load_to_a (first_inst))) +if (bpf_needs_clear_a (&ctx->skf->insns[0 ]))emit (ARM_MOV_I (r_A,0 ), ctx);/* stack space for the BPF_MEM words */
arch/arm64/include/asm/kvm_emulate.h +5 -3
@@ -99,11 +99,13 @@ static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu) *vcpu_cpsr (vcpu) |=COMPAT_PSR_T_BIT ; } +/* +* vcpu_reg should always be passed a register number coming from a +* read of ESR_EL2. Otherwise, it may give the wrong result on AArch32 +* with banked registers. +*/ static inline unsigned long *vcpu_reg (const struct kvm_vcpu *vcpu,u8 reg_num) { -if (vcpu_mode_is_32bit (vcpu)) -return vcpu_reg32 (vcpu, reg_num); -return (unsigned long *)&vcpu_gp_regs (vcpu)->regs.regs[reg_num]; }
arch/arm64/kernel/ptrace.c +6 -0
@@ -58,6 +58,12 @@*/ void ptrace_disable (struct task_struct *child) { +/* +* This would be better off in core code, but PTRACE_DETACH has +* grown its fair share of arch-specific worts and changing it +* is likely to cause regressions on obscure architectures. +*/ +user_disable_single_step (child); }#ifdef CONFIG_HAVE_HW_BREAKPOINT
arch/arm64/kernel/setup.c +4 -0
@@ -523,6 +523,10 @@ static int c_show(struct seq_file *m, void *v)seq_printf (m,"processor\t: %d\n" , i);#endif +seq_printf (m,"BogoMIPS\t: %lu.%02lu\n" , + loops_per_jiffy / (500000UL /HZ ), + loops_per_jiffy / (5000UL /HZ ) %100 ); +/* * Dump out the common processor features in a single line. * Userspace should read the hwcaps with getauxval(AT_HWCAP)
arch/arm64/kernel/suspend.c +10 -0
@@ -1,3 +1,4 @@ +#include <linux/ftrace.h> #include <linux/percpu.h> #include <linux/slab.h> #include <asm/cacheflush.h>
@@ -71,6 +72,13 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))local_dbg_save (flags);/* +* Function graph tracer state gets incosistent when the kernel +* calls functions that never return (aka suspend finishers) hence +* disable graph tracing during their execution. +*/ +pause_graph_tracing (); + +/* * mm context saved on the stack, it will be restored when * the cpu comes out of reset through the identity mapped * page tables, so that the thread address space is properly
@@ -111,6 +119,8 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))hw_breakpoint_restore (NULL ); } +unpause_graph_tracing (); +/* * Restore pstate flags. OS lock and mdscr have been already * restored, so from this point onwards, debugging is fully
arch/arm64/kvm/inject_fault.c +1 -1
@@ -48,7 +48,7 @@ static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset)/* Note: These now point to the banked copies */ *vcpu_spsr (vcpu) = new_spsr_value; - *vcpu_reg (vcpu,14 ) = *vcpu_pc (vcpu) + return_offset; + *vcpu_reg32 (vcpu,14 ) = *vcpu_pc (vcpu) + return_offset;/* Branch to exception vector */ if (sctlr & (1 <<13 ))
arch/arm64/mm/mmu.c +3 -0
@@ -450,6 +450,9 @@ void __init paging_init(void) empty_zero_page =virt_to_page (zero_page); +/* Ensure the zero page is visible to the page table walker */ +dsb (ishst); +/* * TTBR0 is only used for the identity mapping at this stage. Make it * point to zero page to avoid speculatively fetching new entries.
arch/arm64/net/bpf_jit.h +2 -1
@@ -1,7 +1,7 @@/* * BPF JIT compiler for ARM64 * -* Copyright (C) 2014 Zi Shen Lim <[email protected]> +* Copyright (C) 2014-2015 Zi Shen Lim <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -35,6 +35,7 @@aarch64_insn_gen_comp_branch_imm (0 , offset, Rt,A64_VARIANT (sf), \ AARCH64_INSN_BRANCH_COMP_##type)#define A64_CBZ (sf, Rt, imm19) A64_COMP_BRANCH(sf, Rt, (imm19) << 2, ZERO) +#define A64_CBNZ (sf, Rt, imm19) A64_COMP_BRANCH(sf, Rt, (imm19) << 2, NONZERO)/* Conditional branch (immediate) */ #define A64_COND_BRANCH (cond, offset) \
arch/arm64/net/bpf_jit_comp.c +36 -18
81 lines not on this page · raw message
arch/mips/net/bpf_jit.c +1 -15
@@ -556,19 +556,6 @@ static inline u16 align_sp(unsigned int num)return num; } -static bool is_load_to_a (u16 inst) -{ -switch (inst) { -case BPF_LD |BPF_W |BPF_LEN : -case BPF_LD |BPF_W |BPF_ABS : -case BPF_LD |BPF_H |BPF_ABS : -case BPF_LD |BPF_B |BPF_ABS : -return true; -default : -return false; - } -} -static void save_bpf_jit_regs (struct jit_ctx *ctx,unsigned offset) {int i =0 , real_off =0 ;
@@ -686,7 +673,6 @@ static unsigned int get_stack_depth(struct jit_ctx *ctx)static void build_prologue (struct jit_ctx *ctx) { -u16 first_inst = ctx->skf->insns[0 ].code;int sp_off;/* Calculate the total offset for the stack pointer */
@@ -700,7 +686,7 @@ static void build_prologue(struct jit_ctx *ctx)emit_jit_reg_move (r_X, r_zero, ctx);/* Do not leak kernel data to userspace */ -if ((first_inst != (BPF_RET |BPF_K )) && !(is_load_to_a (first_inst))) +if (bpf_needs_clear_a (&ctx->skf->insns[0 ]))emit_jit_reg_move (r_A, r_zero, ctx); }
arch/mn10300/Kconfig +1 -3
@@ -1,6 +1,7 @@ config MN10300 def_bool y select HAVE_OPROFILE + select HAVE_UID16 select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION select HAVE_ARCH_TRACEHOOK
@@ -37,9 +38,6 @@ config HIGHMEM config NUMA def_bool n -config UID16 - def_bool y - config RWSEM_GENERIC_SPINLOCK def_bool y
arch/powerpc/include/asm/cmpxchg.h +8 -8
@@ -18,12 +18,12 @@ __xchg_u32(volatile void *p, unsigned long val)unsigned long prev; __asm__ __volatile__( -PPC_RELEASE_BARRIER +PPC_ATOMIC_ENTRY_BARRIER "1: lwarx %0,0,%2 \n" PPC405_ERR77(0,%2)" stwcx. %3,0,%2 \n\ bne- 1b" -PPC_ACQUIRE_BARRIER +PPC_ATOMIC_EXIT_BARRIER : "=&r" (prev), "+m" (*(volatile unsigned int *)p) : "r" (p), "r" (val) : "cc", "memory");
@@ -61,12 +61,12 @@ __xchg_u64(volatile void *p, unsigned long val)unsigned long prev; __asm__ __volatile__( -PPC_RELEASE_BARRIER +PPC_ATOMIC_ENTRY_BARRIER "1: ldarx %0,0,%2 \n" PPC405_ERR77(0,%2)" stdcx. %3,0,%2 \n\ bne- 1b" -PPC_ACQUIRE_BARRIER +PPC_ATOMIC_EXIT_BARRIER : "=&r" (prev), "+m" (*(volatile unsigned long *)p) : "r" (p), "r" (val) : "cc", "memory");
@@ -152,14 +152,14 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)unsigned int prev; __asm__ __volatile__ ( -PPC_RELEASE_BARRIER +PPC_ATOMIC_ENTRY_BARRIER "1: lwarx %0,0,%2 # __cmpxchg_u32\n\ cmpw 0,%0,%3\n\ bne- 2f\n" PPC405_ERR77(0,%2)" stwcx. %4,0,%2\n\ bne- 1b" -PPC_ACQUIRE_BARRIER +PPC_ATOMIC_EXIT_BARRIER "\n\ 2:" : "=&r" (prev), "+m" (*p)
@@ -198,13 +198,13 @@ __cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new)unsigned long prev; __asm__ __volatile__ ( -PPC_RELEASE_BARRIER +PPC_ATOMIC_ENTRY_BARRIER "1: ldarx %0,0,%2 # __cmpxchg_u64\n\ cmpd 0,%0,%3\n\ bne- 2f\n\ stdcx. %4,0,%2\n\ bne- 1b" -PPC_ACQUIRE_BARRIER +PPC_ATOMIC_EXIT_BARRIER "\n\ 2:" : "=&r" (prev), "+m" (*p)
arch/powerpc/include/asm/reg.h +1 -0
@@ -108,6 +108,7 @@#define MSR_TS_T __MASK(MSR_TS_T_LG)/* Transaction Transactional */ #define MSR_TS_MASK (MSR_TS_T | MSR_TS_S)/* Transaction State bits */ #define MSR_TM_ACTIVE (x) (((x) & MSR_TS_MASK) != 0)/* Transaction active? */ +#define MSR_TM_RESV (x) (((x) & MSR_TS_MASK) == MSR_TS_MASK)/* Reserved */ #define MSR_TM_TRANSACTIONAL (x) (((x) & MSR_TS_MASK) == MSR_TS_T)#define MSR_TM_SUSPENDED (x) (((x) & MSR_TS_MASK) == MSR_TS_S)
arch/powerpc/include/asm/synch.h +1 -1
@@ -44,7 +44,7 @@ static inline void isync(void)MAKE_LWSYNC_SECTION_ENTRY (97 , __lwsync_fixup);#define PPC_ACQUIRE_BARRIER "\n" stringify_in_c(__PPC_ACQUIRE_BARRIER)#define PPC_RELEASE_BARRIER stringify_in_c(LWSYNC) "\n" -#define PPC_ATOMIC_ENTRY_BARRIER "\n" stringify_in_c(LWSYNC) "\n" +#define PPC_ATOMIC_ENTRY_BARRIER "\n" stringify_in_c(sync) "\n"#define PPC_ATOMIC_EXIT_BARRIER "\n" stringify_in_c(sync) "\n"#else #define PPC_ACQUIRE_BARRIER
arch/powerpc/include/uapi/asm/elf.h +2 -0
@@ -295,6 +295,8 @@ do { \#define R_PPC64_TLSLD 108#define R_PPC64_TOCSAVE 109 +#define R_PPC64_ENTRY 118 +#define R_PPC64_REL16 249#define R_PPC64_REL16_LO 250#define R_PPC64_REL16_HI 251
arch/powerpc/kernel/module_64.c +27 -0
@@ -635,6 +635,33 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,*/ break ; +case R_PPC64_ENTRY : +/* +* Optimize ELFv2 large code model entry point if +* the TOC is within 2GB range of current location. +*/ + value =my_r2 (sechdrs, me) - (unsigned long )location; +if (value +0x80008000 >0xffffffff ) +break ; +/* +* Check for the large code model prolog sequence: +* ld r2, ...(r12) +* add r2, r2, r12 +*/ +if ((((uint32_t *)location)[0 ] & ~0xfffc ) + !=0xe84c0000 ) +break ; +if (((uint32_t *)location)[1 ] !=0x7c426214 ) +break ; +/* +* If found, replace it with: +* addis r2, r12, (.TOC.-func)@ha +* addi r2, r12, (.TOC.-func)@l +*/ + ((uint32_t *)location)[0 ] =0x3c4c0000 +PPC_HA (value); + ((uint32_t *)location)[1 ] =0x38420000 +PPC_LO (value); +break ; +case R_PPC64_REL16_HA :/* Subtract location pointer */ value -= (unsigned long )location;
arch/powerpc/kernel/process.c +18 -0
@@ -551,6 +551,24 @@ static void tm_reclaim_thread(struct thread_struct *thr, msr_diff &=MSR_FP |MSR_VEC |MSR_VSX |MSR_FE0 |MSR_FE1 ; } +/* +* Use the current MSR TM suspended bit to track if we have +* checkpointed state outstanding. +* On signal delivery, we'd normally reclaim the checkpointed +* state to obtain stack pointer (see:get_tm_stackpointer()). +* This will then directly return to userspace without going +* through __switch_to(). However, if the stack frame is bad, +* we need to exit this thread which calls __switch_to() which +* will again attempt to reclaim the already saved tm state. +* Hence we need to check that we've not already reclaimed +* this state. +* We do this using the current MSR, rather tracking it in +* some specific thread_struct bit, as it has the additional +* benifit of checking for a potential TM bad thing exception. +*/ +if (!MSR_TM_SUSPENDED (mfmsr ())) +return ; +tm_reclaim (thr, thr->regs->msr, cause);/* Having done the reclaim, we now have the checkpointed
arch/powerpc/kernel/signal_32.c +9 -5
@@ -875,6 +875,15 @@ static long restore_tm_user_regs(struct pt_regs *regs,return 1 ;#endif /* CONFIG_SPE */ +/* Get the top half of the MSR from the user context */ +if (__get_user (msr_hi, &tm_sr->mc_gregs[PT_MSR ])) +return 1 ; + msr_hi <<=32 ; +/* If TM bits are set to the reserved value, it's an invalid context */ +if (MSR_TM_RESV (msr_hi)) +return 1 ; +/* Pull in the MSR TM bits from the user context */ + regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr_hi &MSR_TS_MASK );/* Now, recheckpoint. This loads up all of the checkpointed (older) * registers, including FP and V[S]Rs. After recheckpointing, the * transactional versions should be loaded.
@@ -884,11 +893,6 @@ static long restore_tm_user_regs(struct pt_regs *regs, current->thread.tm_texasr |=TEXASR_FS ;/* This loads the checkpointed FP/VEC state, if used */ tm_recheckpoint (¤t->thread, msr); -/* Get the top half of the MSR */ -if (__get_user (msr_hi, &tm_sr->mc_gregs[PT_MSR ])) -return 1 ; -/* Pull in MSR TM from user context */ - regs->msr = (regs->msr & ~MSR_TS_MASK ) | ((msr_hi<<32 ) &MSR_TS_MASK );/* This loads the speculative FP/VEC state, if used */ if (msr &MSR_FP ) {
arch/powerpc/kernel/signal_64.c +4 -0
@@ -427,6 +427,10 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,/* get MSR separately, transfer the LE bit if doing signal return */ err |=__get_user (msr, &sc->gp_regs[PT_MSR ]); +/* Don't allow reserved mode. */ +if (MSR_TM_RESV (msr)) +return -EINVAL ; +/* pull in MSR TM from user context */ regs->msr = (regs->msr & ~MSR_TS_MASK ) | (msr &MSR_TS_MASK );
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -210,6 +210,12 @@ static void kvmppc_core_vcpu_put_hv(struct kvm_vcpu *vcpu)static void kvmppc_set_msr_hv (struct kvm_vcpu *vcpu,u64 msr) { +/* +* Check for illegal transactional state bit combination +* and if we find it, force the TS field to a safe state. +*/ +if ((msr &MSR_TS_MASK ) ==MSR_TS_MASK ) + msr &= ~MSR_TS_MASK ; vcpu->arch.shregs.msr = msr;kvmppc_end_cede (vcpu); }
arch/powerpc/net/bpf_jit_comp.c +2 -11
@@ -78,18 +78,9 @@ static void bpf_jit_build_prologue(struct bpf_prog *fp, u32 *image,PPC_LI (r_X,0 ); } -switch (filter[0 ].code) { -case BPF_RET |BPF_K : -case BPF_LD |BPF_W |BPF_LEN : -case BPF_LD |BPF_W |BPF_ABS : -case BPF_LD |BPF_H |BPF_ABS : -case BPF_LD |BPF_B |BPF_ABS : -/* first instruction sets A register (or is RET 'constant') */ -break ; -default : -/* make sure we dont leak kernel information to user */ +/* make sure we dont leak kernel information to user */ +if (bpf_needs_clear_a (&filter[0 ]))PPC_LI (r_A,0 ); - } }static void bpf_jit_build_epilogue (u32 *image,struct codegen_context *ctx)
arch/powerpc/platforms/powernv/opal.c +1 -1
@@ -358,7 +358,7 @@ static void opal_handle_message(void)/* Sanity check */ if (type >=OPAL_MSG_TYPE_MAX ) { -pr_warning ("%s: Unknown message type: %u\n" , __func__, type); +pr_warn_once ("%s: Unknown message type: %u\n" , __func__, type);return ; }opal_message_do_notify (type, (void *)&msg);
arch/sparc/net/bpf_jit_comp.c +2 -15
@@ -420,22 +420,9 @@ void bpf_jit_compile(struct bpf_prog *fp) }emit_reg_move (O7 , r_saved_O7); -switch (filter[0 ].code) { -case BPF_RET |BPF_K : -case BPF_LD |BPF_W |BPF_LEN : -case BPF_LD |BPF_W |BPF_ABS : -case BPF_LD |BPF_H |BPF_ABS : -case BPF_LD |BPF_B |BPF_ABS : -/* The first instruction sets the A register (or is -* a "RET 'constant'") -*/ -break ; -default : -/* Make sure we dont leak kernel information to the -* user. -*/ +/* Make sure we dont leak kernel information to the user. */ +if (bpf_needs_clear_a (&filter[0 ]))emit_clear (r_A);/* A = 0 */ - }for (i =0 ; i < flen; i++) {unsigned int K = filter[i].k;
arch/x86/include/asm/boot.h +1 -1
@@ -27,7 +27,7 @@#define BOOT_HEAP_SIZE 0x400000#else /* !CONFIG_KERNEL_BZIP2 */ -#define BOOT_HEAP_SIZE 0x8000 +#define BOOT_HEAP_SIZE 0x10000#endif /* !CONFIG_KERNEL_BZIP2 */
arch/x86/include/asm/mmu_context.h +33 -1
@@ -104,8 +104,36 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,#endif cpumask_set_cpu (cpu,mm_cpumask (next)); -/* Re-load page tables */ +/* +* Re-load page tables. +* +* This logic has an ordering constraint: +* +* CPU 0: Write to a PTE for 'next' +* CPU 0: load bit 1 in mm_cpumask. if nonzero, send IPI. +* CPU 1: set bit 1 in next's mm_cpumask +* CPU 1: load from the PTE that CPU 0 writes (implicit) +* +* We need to prevent an outcome in which CPU 1 observes +* the new PTE value and CPU 0 observes bit 1 clear in +* mm_cpumask. (If that occurs, then the IPI will never +* be sent, and CPU 0's TLB will contain a stale entry.) +* +* The bad outcome can occur if either CPU's load is +* reordered before that CPU's store, so both CPUs must +* execute full barriers to prevent this from happening. +* +* Thus, switch_mm needs a full barrier between the +* store to mm_cpumask and any operation that could load +* from next->pgd. TLB fills are special and can happen +* due to instruction fetches or for no reason at all, +* and neither LOCK nor MFENCE orders them. +* Fortunately, load_cr3() is serializing and gives the +* ordering guarantee we need. +* +*/ load_cr3 (next->pgd); +trace_tlb_flush (TLB_FLUSH_ON_TASK_SWITCH ,TLB_FLUSH_ALL );/* Stop flush ipis for the previous mm */
@@ -142,10 +170,14 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,* schedule, protecting us from simultaneous changes. */ cpumask_set_cpu (cpu,mm_cpumask (next)); +/* * We were in lazy tlb mode and leave_mm disabled * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. +* +* As above, load_cr3() is serializing and orders TLB +* fills with respect to the mm_cpumask write. */ load_cr3 (next->pgd);trace_tlb_flush (TLB_FLUSH_ON_TASK_SWITCH ,TLB_FLUSH_ALL );
arch/x86/kernel/reboot.c +8 -0
@@ -182,6 +182,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), }, }, + { /* Handle problems with rebooting on the iMac10,1. */ + .callback = set_pci_reboot, + .ident = "Apple iMac10,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "iMac10,1"), + }, + },/* ASRock */ {/* Handle problems with rebooting on ASRock Q1900DC-ITX */
arch/x86/kernel/signal.c +10 -7
@@ -667,12 +667,15 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)signal_setup_done (failed, ksig, stepping); } -#ifdef CONFIG_X86_32 -#define NR_restart_syscall __NR_restart_syscall -#else /* !CONFIG_X86_32 */ -#define NR_restart_syscall \ - test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall -#endif /* CONFIG_X86_32 */ +static inline unsigned long get_nr_restart_syscall (const struct pt_regs *regs) +{ +#if defined(CONFIG_X86_32 ) || !defined(CONFIG_X86_64 ) +return __NR_restart_syscall; +#else /* !CONFIG_X86_32 && CONFIG_X86_64 */ +return test_thread_flag (TIF_IA32 ) ? __NR_ia32_restart_syscall : + __NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT); +#endif /* CONFIG_X86_32 || !CONFIG_X86_64 */ +}/* * Note that 'init' is a special process: it doesn't get signals it doesn't
@@ -701,7 +704,7 @@ static void do_signal(struct pt_regs *regs)break ;case -ERESTART_RESTARTBLOCK : - regs->ax = NR_restart_syscall; + regs->ax =get_nr_restart_syscall (regs); regs->ip -=2 ;break ; }
arch/x86/kvm/svm.c +3 -11
@@ -1106,6 +1106,7 @@ static void init_vmcb(struct vcpu_svm *svm)set_exception_intercept (svm,UD_VECTOR );set_exception_intercept (svm,MC_VECTOR );set_exception_intercept (svm,AC_VECTOR ); +set_exception_intercept (svm,DB_VECTOR );set_intercept (svm,INTERCEPT_INTR );set_intercept (svm,INTERCEPT_NMI );
@@ -1638,20 +1639,13 @@ static void svm_set_segment(struct kvm_vcpu *vcpu,mark_dirty (svm->vmcb,VMCB_SEG ); } -static void update_db_bp_intercept (struct kvm_vcpu *vcpu) +static void update_bp_intercept (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu); -clr_exception_intercept (svm,DB_VECTOR );clr_exception_intercept (svm,BP_VECTOR ); -if (svm->nmi_singlestep) -set_exception_intercept (svm,DB_VECTOR ); -if (vcpu->guest_debug &KVM_GUESTDBG_ENABLE ) { -if (vcpu->guest_debug & - (KVM_GUESTDBG_SINGLESTEP |KVM_GUESTDBG_USE_HW_BP )) -set_exception_intercept (svm,DB_VECTOR );if (vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP )set_exception_intercept (svm,BP_VECTOR ); }else
@@ -1757,7 +1751,6 @@ static int db_interception(struct vcpu_svm *svm)if (!(svm->vcpu.guest_debug &KVM_GUESTDBG_SINGLESTEP )) svm->vmcb->save.rflags &= ~(X86_EFLAGS_TF |X86_EFLAGS_RF ); -update_db_bp_intercept (&svm->vcpu); } if (svm->vcpu.guest_debug &
@@ -3751,7 +3744,6 @@ static void enable_nmi_window(struct kvm_vcpu *vcpu)*/ svm->nmi_singlestep = true; svm->vmcb->save.rflags |= (X86_EFLAGS_TF |X86_EFLAGS_RF ); -update_db_bp_intercept (vcpu); }static int svm_set_tss_addr (struct kvm *kvm,unsigned int addr)
@@ -4367,7 +4359,7 @@ static struct kvm_x86_ops svm_x86_ops = { .vcpu_load = svm_vcpu_load, .vcpu_put = svm_vcpu_put, - .update_db_bp_intercept = update_db_bp_intercept, + .update_db_bp_intercept = update_bp_intercept, .get_msr = svm_get_msr, .set_msr = svm_set_msr, .get_segment_base = svm_get_segment_base,
arch/x86/kvm/trace.h +1 -1
@@ -250,7 +250,7 @@ TRACE_EVENT(kvm_inj_virq,#define kvm_trace_sym_exc \ EXS(DE), EXS(DB), EXS(BP), EXS(OF), EXS(BR), EXS(UD), EXS(NM), \ EXS(DF), EXS(TS), EXS(NP), EXS(SS), EXS(GP), EXS(PF), \ - EXS(MF), EXS(MC) + EXS(MF), EXS(AC), EXS(MC)/* * Tracepoint for kvm interrupt injection:
arch/x86/kvm/vmx.c +10 -9
@@ -3652,20 +3652,21 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)if (!is_paging (vcpu)) { hw_cr4 &= ~X86_CR4_PAE ; hw_cr4 |=X86_CR4_PSE ; -/* -* SMEP/SMAP is disabled if CPU is in non-paging mode -* in hardware. However KVM always uses paging mode to -* emulate guest non-paging mode with TDP. -* To emulate this behavior, SMEP/SMAP needs to be -* manually disabled when guest switches to non-paging -* mode. -*/ - hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP ); }else if (!(cr4 &X86_CR4_PAE )) { hw_cr4 &= ~X86_CR4_PAE ; } } +if (!enable_unrestricted_guest && !is_paging (vcpu)) +/* +* SMEP/SMAP is disabled if CPU is in non-paging mode in +* hardware. However KVM always uses paging mode without +* unrestricted guest. +* To emulate this behavior, SMEP/SMAP needs to be manually +* disabled when guest switches to non-paging mode. +*/ + hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP ); +vmcs_writel (CR4_READ_SHADOW , cr4);vmcs_writel (GUEST_CR4 , hw_cr4);return 0 ;
arch/x86/kvm/x86.c +6 -5
@@ -940,7 +940,7 @@ static u32 msrs_to_save[] = {MSR_CSTAR ,MSR_KERNEL_GS_BASE ,MSR_SYSCALL_MASK ,MSR_LSTAR , #endifMSR_IA32_TSC ,MSR_IA32_CR_PAT ,MSR_VM_HSAVE_PA , -MSR_IA32_FEATURE_CONTROL ,MSR_IA32_BNDCFGS + MSR_IA32_FEATURE_CONTROL, MSR_IA32_BNDCFGS, MSR_TSC_AUX, };static unsigned num_msrs_to_save;
@@ -4117,16 +4117,17 @@ static void kvm_init_msr_list(void)/* * Even MSRs that are valid in the host may not be exposed -* to the guests in some cases. We could work around this -* in VMX with the generic MSR save/load machinery, but it -* is not really worthwhile since it will really only -* happen with nested virtualization. +* to the guests in some cases. */ switch (msrs_to_save[i]) {case MSR_IA32_BNDCFGS :if (!kvm_x86_ops->mpx_supported ())continue ;break ; +case MSR_TSC_AUX : +if (!kvm_x86_ops->rdtscp_supported ()) +continue ; +break ;default :break ; }
arch/x86/mm/mpx.c +3 -3
@@ -120,19 +120,19 @@ static int get_reg_offset(struct insn *insn, struct pt_regs *regs,switch (type) {case REG_TYPE_RM : regno =X86_MODRM_RM (insn->modrm.value); -if (X86_REX_B (insn->rex_prefix.value) ==1 ) +if (X86_REX_B (insn->rex_prefix.value)) regno +=8 ;break ;case REG_TYPE_INDEX : regno =X86_SIB_INDEX (insn->sib.value); -if (X86_REX_X (insn->rex_prefix.value) ==1 ) +if (X86_REX_X (insn->rex_prefix.value)) regno +=8 ;break ;case REG_TYPE_BASE : regno =X86_SIB_BASE (insn->sib.value); -if (X86_REX_B (insn->rex_prefix.value) ==1 ) +if (X86_REX_B (insn->rex_prefix.value)) regno +=8 ;break ;
arch/x86/mm/tlb.c +26 -3
@@ -160,7 +160,10 @@ void flush_tlb_current_task(void)preempt_disable ();count_vm_tlb_event (NR_TLB_LOCAL_FLUSH_ALL ); + +/* This is an implicit full barrier that synchronizes with switch_mm. */ local_flush_tlb (); +trace_tlb_flush (TLB_LOCAL_SHOOTDOWN ,TLB_FLUSH_ALL );if (cpumask_any_but (mm_cpumask (mm),smp_processor_id ()) < nr_cpu_ids)flush_tlb_others (mm_cpumask (mm), mm,0UL ,TLB_FLUSH_ALL );
@@ -187,17 +190,29 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,unsigned long base_pages_to_flush =TLB_FLUSH_ALL ;preempt_disable (); -if (current->active_mm != mm) +if (current->active_mm != mm) { +/* Synchronize with switch_mm. */ +smp_mb (); + goto out; + }if (!current->mm) {leave_mm (smp_processor_id ()); + +/* Synchronize with switch_mm. */ +smp_mb (); + goto out; }if ((end !=TLB_FLUSH_ALL ) && !(vmflag &VM_HUGETLB )) base_pages_to_flush = (end - start) >>PAGE_SHIFT ; +/* +* Both branches below are implicit full barriers (MOV to CR or +* INVLPG) that synchronize with switch_mm. +*/ if (base_pages_to_flush > tlb_single_page_flush_ceiling) { base_pages_to_flush =TLB_FLUSH_ALL ;count_vm_tlb_event (NR_TLB_LOCAL_FLUSH_ALL );
@@ -227,10 +242,18 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long start)preempt_disable ();if (current->active_mm == mm) { -if (current->mm) +if (current->mm) { +/* +* Implicit full barrier (INVLPG) that synchronizes +* with switch_mm. +*/ __flush_tlb_one (start); -else + }else {leave_mm (smp_processor_id ()); + +/* Synchronize with switch_mm. */ +smp_mb (); + } }if (cpumask_any_but (mm_cpumask (mm),smp_processor_id ()) < nr_cpu_ids)
arch/x86/xen/suspend.c +2 -1
@@ -32,7 +32,8 @@ static void xen_hvm_post_suspend(int suspend_cancelled) {#ifdef CONFIG_XEN_PVHVM int cpu; -xen_hvm_init_shared_info (); +if (!suspend_cancelled) +xen_hvm_init_shared_info ();xen_callback_vector ();xen_unplug_emulated_devices ();if (xen_feature (XENFEAT_hvm_safe_pvclock)) {
drivers/char/ipmi/ipmi_si_intf.c +48 -33
178 lines not on this page · raw message
drivers/connector/connector.c +3 -8
@@ -178,26 +178,21 @@ static int cn_call_callback(struct sk_buff *skb)* * It checks skb, netlink header and msg sizes, and calls callback helper. */ -static void cn_rx_skb (struct sk_buff *__skb) +static void cn_rx_skb (struct sk_buff *skb) {struct nlmsghdr *nlh; -struct sk_buff *skb;int len, err; - skb =skb_get (__skb); -if (skb->len >=NLMSG_HDRLEN ) { nlh =nlmsg_hdr (skb); len =nlmsg_len (nlh);if (len < (int )sizeof (struct cn_msg ) || skb->len < nlh->nlmsg_len || - len >CONNECTOR_MAX_MSG_SIZE ) { -kfree_skb (skb); + len >CONNECTOR_MAX_MSG_SIZE )return ; - } - err =cn_call_callback (skb); + err =cn_call_callback (skb_get (skb));if (err <0 )kfree_skb (skb); }
drivers/hid/hid-core.c +1 -1
@@ -1589,7 +1589,7 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) "Multi-Axis Controller" };const char *type, *bus; -char buf[64 ]; +char buf[64 ] ="" ;unsigned int i;int len;int ret;
drivers/iommu/intel-iommu.c +6 -3
@@ -3928,14 +3928,17 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev) dev =pci_physfn (dev);for (bus = dev->bus; bus; bus = bus->parent) { bridge = bus->self; -if (!bridge || !pci_is_pcie (bridge) || +/* If it's an integrated device, allow ATS */ +if (!bridge) +return 1 ; +/* Connected via non-PCIe: no ATS */ +if (!pci_is_pcie (bridge) ||pci_pcie_type (bridge) ==PCI_EXP_TYPE_PCI_BRIDGE )return 0 ; +/* If we found the root port, look it up in the ATSR */ if (pci_pcie_type (bridge) ==PCI_EXP_TYPE_ROOT_PORT )break ; } -if (!bridge) -return 0 ;rcu_read_lock ();list_for_each_entry_rcu (atsru, &dmar_atsr_units, list) {
drivers/isdn/i4l/isdn_ppp.c +8 -4
@@ -301,6 +301,8 @@ isdn_ppp_open(int min, struct file *file) is->compflags =0 ; is->reset =isdn_ppp_ccp_reset_alloc (is); +if (!is->reset) +return -ENOMEM ; is->lp =NULL ; is->mp_seqno =0 ;/* MP sequence number */
@@ -320,6 +322,10 @@ isdn_ppp_open(int min, struct file *file)* VJ header compression init */ is->slcomp =slhc_init (16 ,16 );/* not necessary for 2. link in bundle */ +if (IS_ERR (is->slcomp)) { +isdn_ppp_ccp_reset_free (is); +return PTR_ERR (is->slcomp); + }#endif #ifdef CONFIG_IPPP_FILTER is->pass_filter =NULL ;
@@ -567,10 +573,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) is->maxcid = val;#ifdef CONFIG_ISDN_PPP_VJ sltmp =slhc_init (16 , val); -if (!sltmp) { -printk (KERN_ERR "ippp, can't realloc slhc struct\n" ); -return -ENOMEM ; - } +if (IS_ERR (sltmp)) +return PTR_ERR (sltmp);if (is->slcomp)slhc_free (is->slcomp); is->slcomp = sltmp;
drivers/media/platform/vivid/vivid-osd.c +1 -0
@@ -85,6 +85,7 @@ static int vivid_fb_ioctl(struct fb_info *info, unsigned cmd, unsigned long arg)case FBIOGET_VBLANK : {struct fb_vblank vblank; +memset (&vblank,0 ,sizeof (vblank)); vblank.flags =FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |FB_VBLANK_HAVE_VSYNC ; vblank.count =0 ;
drivers/media/usb/airspy/airspy.c +1 -1
@@ -132,7 +132,7 @@ struct airspy {int urbs_submitted;/* USB control message buffer */ -#define BUF_SIZE 24 +#define BUF_SIZE 128u8 buf[BUF_SIZE ];/* Current configuration */
drivers/net/bonding/bond_main.c +4 -1
@@ -1194,7 +1194,6 @@ static int bond_master_upper_dev_link(struct net_device *bond_dev, err =netdev_master_upper_dev_link_private (slave_dev, bond_dev, slave);if (err)return err; - slave_dev->flags |=IFF_SLAVE ;rtmsg_ifinfo (RTM_NEWLINK , slave_dev,IFF_SLAVE ,GFP_KERNEL );return 0 ; }
@@ -1452,6 +1451,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) } } +/* set slave flag before open to prevent IPv6 addrconf */ + slave_dev->flags |=IFF_SLAVE ; +/* open the slave since the application closed it */ res =dev_open (slave_dev);if (res) {
@@ -1712,6 +1714,7 @@ err_close:dev_close (slave_dev); err_restore_mac: + slave_dev->flags &= ~IFF_SLAVE ;if (!bond->params.fail_over_mac ||BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP ) {/* XXX TODO - fom follow mode needs to change master's
drivers/net/ppp/ppp_generic.c +2 -4
@@ -715,10 +715,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) val &=0xffff ; } vj =slhc_init (val2+1 , val+1 ); -if (!vj) { -netdev_err (ppp->dev, -"PPP: no memory (VJ compressor)\n" ); - err = -ENOMEM ; +if (IS_ERR (vj)) { + err =PTR_ERR (vj);break ; }ppp_lock (ppp);
drivers/net/slip/slhc.c +8 -4
@@ -84,8 +84,9 @@ static long decode(unsigned char **cpp);static unsigned char *put16 (unsigned char *cp,unsigned short x);static unsigned short pull16 (unsigned char **cpp); -/* Initialize compression data structure +/* Allocate compression data structure * slots must be in range 0 to 255 (zero meaning no compression) +* Returns pointer to structure or ERR_PTR() on error. */ struct slcompress *slhc_init (int rslots,int tslots)
@@ -94,11 +95,14 @@ slhc_init(int rslots, int tslots) registerstruct cstate *ts;struct slcompress *comp; +if (rslots <0 || rslots >255 || tslots <0 || tslots >255 ) +return ERR_PTR (-EINVAL ); + comp =kzalloc (sizeof (struct slcompress ),GFP_KERNEL );if (! comp) goto out_fail; -if ( rslots >0 && rslots <256 ) { +if (rslots >0 ) {size_t rsize = rslots *sizeof (struct cstate ); comp->rstate =kzalloc (rsize,GFP_KERNEL );if (! comp->rstate)
@@ -106,7 +110,7 @@ slhc_init(int rslots, int tslots) comp->rslot_limit = rslots -1 ; } -if ( tslots >0 && tslots <256 ) { +if (tslots >0 ) {size_t tsize = tslots *sizeof (struct cstate ); comp->tstate =kzalloc (tsize,GFP_KERNEL );if (! comp->tstate)
@@ -141,7 +145,7 @@ out_free2: out_free:kfree (comp); out_fail: -return NULL ; +return ERR_PTR (-ENOMEM ); }
drivers/net/slip/slip.c +1 -1
@@ -164,7 +164,7 @@ static int sl_alloc_bufs(struct slip *sl, int mtu)if (cbuff ==NULL ) goto err_exit; slcomp =slhc_init (16 ,16 ); -if (slcomp ==NULL ) +if (IS_ERR (slcomp)) goto err_exit;#endif spin_lock_bh (&sl->lock);
drivers/net/team/team.c +3 -3
@@ -1845,10 +1845,10 @@ static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)struct team *team =netdev_priv (dev);struct team_port *port; -rcu_read_lock (); -list_for_each_entry_rcu (port, &team->port_list, list) +mutex_lock (&team->lock); +list_for_each_entry (port, &team->port_list, list)vlan_vid_del (port->dev, proto, vid); -rcu_read_unlock (); +mutex_unlock (&team->lock);return 0 ; }
drivers/net/usb/cdc_mbim.c +1 -1
@@ -100,7 +100,7 @@ static const struct net_device_ops cdc_mbim_netdev_ops = { .ndo_stop = usbnet_stop, .ndo_start_xmit = usbnet_start_xmit, .ndo_tx_timeout = usbnet_tx_timeout, - .ndo_change_mtu = usbnet_change_mtu, + .ndo_change_mtu = cdc_ncm_change_mtu, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_vlan_rx_add_vid = cdc_mbim_rx_add_vid,
drivers/net/usb/cdc_ncm.c +31 -0
@@ -41,6 +41,7 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/ctype.h> +#include <linux/etherdevice.h> #include <linux/ethtool.h> #include <linux/workqueue.h> #include <linux/mii.h>
@@ -687,6 +688,33 @@ static void cdc_ncm_free(struct cdc_ncm_ctx *ctx)kfree (ctx); } +/* we need to override the usbnet change_mtu ndo for two reasons: +* - respect the negotiated maximum datagram size +* - avoid unwanted changes to rx and tx buffers +*/ +int cdc_ncm_change_mtu (struct net_device *net,int new_mtu) +{ +struct usbnet *dev =netdev_priv (net); +struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0 ]; +int maxmtu = ctx->max_datagram_size -cdc_ncm_eth_hlen (dev); + +if (new_mtu <=0 || new_mtu > maxmtu) +return -EINVAL ; + net->mtu = new_mtu; +return 0 ; +} +EXPORT_SYMBOL_GPL (cdc_ncm_change_mtu); + +static const struct net_device_ops cdc_ncm_netdev_ops = { + .ndo_open = usbnet_open, + .ndo_stop = usbnet_stop, + .ndo_start_xmit = usbnet_start_xmit, + .ndo_tx_timeout = usbnet_tx_timeout, + .ndo_change_mtu = cdc_ncm_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; +int cdc_ncm_bind_common (struct usbnet *dev,struct usb_interface *intf,u8 data_altsetting) {const struct usb_cdc_union_desc *union_desc =NULL ;
@@ -861,6 +889,9 @@ advance:/* add our sysfs attrs */ dev->net->sysfs_groups[0 ] = &cdc_ncm_sysfs_attr_group; +/* must handle MTU changes */ + dev->net->netdev_ops = &cdc_ncm_netdev_ops; +return 0 ; error2:
drivers/net/veth.c +0 -6
@@ -117,12 +117,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)kfree_skb (skb); goto drop; } -/* don't change ip_summed == CHECKSUM_PARTIAL, as that -* will cause bad checksum on forwarded packets -*/ -if (skb->ip_summed ==CHECKSUM_NONE && - rcv->features &NETIF_F_RXCSUM ) - skb->ip_summed =CHECKSUM_UNNECESSARY ;if (likely (dev_forward_skb (rcv, skb) ==NET_RX_SUCCESS )) {struct pcpu_vstats *stats =this_cpu_ptr (dev->vstats);
drivers/net/vxlan.c +8 -4
@@ -2581,7 +2581,7 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) { struct vxlan_net *vn = net_generic(src_net, vxlan_net_id); -struct vxlan_dev *vxlan =netdev_priv (dev); +struct vxlan_dev *vxlan =netdev_priv (dev), *tmp;struct vxlan_rdst *dst = &vxlan->default_dst;__u32 vni;int err;
@@ -2714,9 +2714,13 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,if (data[IFLA_VXLAN_REMCSUM_NOPARTIAL ]) vxlan->flags |=VXLAN_F_REMCSUM_NOPARTIAL ; -if (vxlan_find_vni (src_net, vni, use_ipv6 ?AF_INET6 :AF_INET , - vxlan->dst_port, vxlan->flags)) { -pr_info ("duplicate VNI %u\n" , vni); +list_for_each_entry (tmp, &vn->vxlan_list, next) { +if (tmp->default_dst.remote_vni == vni && + (tmp->default_dst.remote_ip.sa.sa_family ==AF_INET6 || + tmp->saddr.sa.sa_family ==AF_INET6 ) == use_ipv6 && + tmp->dst_port == vxlan->dst_port && + (tmp->flags &VXLAN_F_RCV_FLAGS ) == + (vxlan->flags &VXLAN_F_RCV_FLAGS ))return -EEXIST ; }
drivers/net/xen-netback/netback.c +5 -2
@@ -2007,8 +2007,11 @@ static int __init netback_init(void)if (!xen_domain ())return -ENODEV ; -/* Allow as many queues as there are CPUs, by default */ - xenvif_max_queues =num_online_cpus (); +/* Allow as many queues as there are CPUs if user has not +* specified a value. +*/ +if (xenvif_max_queues ==0 ) + xenvif_max_queues =num_online_cpus ();if (fatal_skb_slots <XEN_NETBK_LEGACY_SLOTS_MAX ) { pr_info("fatal_skb_slots too small (%d), bump it to XEN_NETBK_LEGACY_SLOTS_MAX (%d)\n",
drivers/net/xen-netfront.c +12 -9
@@ -1710,19 +1710,19 @@ static void xennet_destroy_queues(struct netfront_info *info) }static int xennet_create_queues (struct netfront_info *info, -unsigned int num_queues) +unsigned int *num_queues) {unsigned int i;int ret; - info->queues =kcalloc (num_queues,sizeof (struct netfront_queue ), + info->queues =kcalloc (*num_queues,sizeof (struct netfront_queue ),GFP_KERNEL );if (!info->queues)return -ENOMEM ;rtnl_lock (); -for (i =0 ; i < num_queues; i++) { +for (i =0 ; i < *num_queues; i++) {struct netfront_queue *queue = &info->queues[i]; queue->id = i;
@@ -1732,7 +1732,7 @@ static int xennet_create_queues(struct netfront_info *info,if (ret <0 ) {dev_warn (&info->netdev->dev,"only created %d queues\n" , i); - num_queues = i; + *num_queues = i;break ; }
@@ -1742,11 +1742,11 @@ static int xennet_create_queues(struct netfront_info *info,napi_enable (&queue->napi); } -netif_set_real_num_tx_queues (info->netdev, num_queues); +netif_set_real_num_tx_queues (info->netdev, *num_queues);rtnl_unlock (); -if (num_queues ==0 ) { +if (*num_queues ==0 ) {dev_err (&info->netdev->dev,"no queues\n" );return -EINVAL ; }
@@ -1792,7 +1792,7 @@ static int talk_to_netback(struct xenbus_device *dev,if (info->queues)xennet_destroy_queues (info); - err =xennet_create_queues (info, num_queues); + err =xennet_create_queues (info, &num_queues);if (err <0 ) goto destroy_ring;
@@ -2140,8 +2140,11 @@ static int __init netif_init(void)pr_info ("Initialising Xen virtual ethernet driver\n" ); -/* Allow as many queues as there are CPUs, by default */ - xennet_max_queues =num_online_cpus (); +/* Allow as many queues as there are CPUs if user has not +* specified a value. +*/ +if (xennet_max_queues ==0 ) + xennet_max_queues =num_online_cpus ();return xenbus_register_frontend (&netfront_driver); }
drivers/parisc/iommu-helpers.h +8 -7
@@ -104,7 +104,11 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,struct scatterlist *contig_sg;/* contig chunk head */ unsigned long dma_offset, dma_len;/* start/len of DMA stream */ unsigned int n_mappings =0 ; -unsigned int max_seg_size =dma_get_max_seg_size (dev); +unsigned int max_seg_size =min (dma_get_max_seg_size (dev), + (unsigned )DMA_CHUNK_SIZE ); +unsigned int max_seg_boundary =dma_get_seg_boundary (dev) +1 ; +if (max_seg_boundary)/* check if the addition above didn't overflow */ + max_seg_size =min (max_seg_size, max_seg_boundary);while (nents >0 ) {
@@ -138,14 +142,11 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,/* ** First make sure current dma stream won't -** exceed DMA_CHUNK_SIZE if we coalesce the +** exceed max_seg_size if we coalesce the ** next entry. */ -if (unlikely (ALIGN (dma_len + dma_offset + startsg->length, -IOVP_SIZE ) >DMA_CHUNK_SIZE )) -break ; - -if (startsg->length + dma_len > max_seg_size) +if (unlikely (ALIGN (dma_len + dma_offset + startsg->length,IOVP_SIZE ) > + max_seg_size))break ;/*
drivers/staging/lustre/lustre/obdecho/echo_client.c +11 -9
@@ -1268,6 +1268,7 @@ static int echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob) { struct lov_stripe_md *ulsm = _ulsm; +struct lov_oinfo **p;int nob, i; nob = offsetof(struct lov_stripe_md, lsm_oinfo[lsm->lsm_stripe_count]);
@@ -1277,9 +1278,10 @@ echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)if (copy_to_user (ulsm, lsm,sizeof (*ulsm)))return -EFAULT ; -for (i =0 ; i < lsm->lsm_stripe_count; i++) { -if (copy_to_user (ulsm->lsm_oinfo[i], lsm->lsm_oinfo[i], -sizeof (lsm->lsm_oinfo[0 ]))) +for (i =0 , p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) { +struct lov_oinfo __user *up; +if (get_user (up, ulsm->lsm_oinfo + i) || +copy_to_user (up, *p,sizeof (struct lov_oinfo )))return -EFAULT ; }return 0 ;
@@ -1287,9 +1289,10 @@ echo_copyout_lsm(struct lov_stripe_md *lsm, void *_ulsm, int ulsm_nob)static int echo_copyin_lsm (struct echo_device *ed,struct lov_stripe_md *lsm, -void *ulsm,int ulsm_nob) +struct lov_stripe_md __user *ulsm,int ulsm_nob) {struct echo_client_obd *ec = ed->ed_ec; +struct lov_oinfo **p;int i;if (ulsm_nob <sizeof (*lsm))
@@ -1305,11 +1308,10 @@ echo_copyin_lsm(struct echo_device *ed, struct lov_stripe_md *lsm,return -EINVAL ; -for (i =0 ; i < lsm->lsm_stripe_count; i++) { -if (copy_from_user (lsm->lsm_oinfo[i], - ((struct lov_stripe_md *)ulsm)-> \ - lsm_oinfo[i], -sizeof (lsm->lsm_oinfo[0 ]))) +for (i =0 , p = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, p++) { +struct lov_oinfo __user *up; +if (get_user (up, ulsm->lsm_oinfo + i) || +copy_from_user (*p, up,sizeof (struct lov_oinfo )))return -EFAULT ; }return 0 ;
drivers/usb/core/hub.c +19 -3
@@ -1034,10 +1034,20 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)unsigned delay;/* Continue a partial initialization */ -if (type ==HUB_INIT2 ) - goto init2; -if (type ==HUB_INIT3 ) +if (type ==HUB_INIT2 || type ==HUB_INIT3 ) { +device_lock (hub->intfdev); + +/* Was the hub disconnected while we were waiting? */ +if (hub->disconnected) { +device_unlock (hub->intfdev); +kref_put (&hub->kref, hub_release); +return ; + } +if (type ==HUB_INIT2 ) + goto init2; goto init3; + } +kref_get (&hub->kref);/* The superspeed hub except for root hub has to use Hub Depth * value as an offset into the route string to locate the bits
@@ -1235,6 +1245,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)queue_delayed_work (system_power_efficient_wq, &hub->init_work,msecs_to_jiffies (delay)); +device_unlock (hub->intfdev);return ;/* Continues at init3: below */ }else {msleep (delay);
@@ -1256,6 +1267,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)/* Allow autosuspend if it was suppressed */ if (type <=HUB_INIT3 )usb_autopm_put_interface_async (to_usb_interface (hub->intfdev)); + +if (type ==HUB_INIT2 || type ==HUB_INIT3 ) +device_unlock (hub->intfdev); + +kref_put (&hub->kref, hub_release); }/* Implement the continuations for the delays above */
drivers/usb/host/xhci.c +12 -0
@@ -4794,8 +4794,16 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, ctrl_ctx->add_flags |=cpu_to_le32 (SLOT_FLAG ); slot_ctx =xhci_get_slot_ctx (xhci, config_cmd->in_ctx); slot_ctx->dev_info |=cpu_to_le32 (DEV_HUB ); +/* +* refer to section 6.2.2: MTT should be 0 for full speed hub, +* but it may be already set to 1 when setup an xHCI virtual +* device, so clear it anyway. +*/ if (tt->multi) slot_ctx->dev_info |=cpu_to_le32 (DEV_MTT ); +else if (hdev->speed ==USB_SPEED_FULL ) + slot_ctx->dev_info &=cpu_to_le32 (~DEV_MTT ); +if (xhci->hci_version >0x95 ) { xhci_dbg(xhci, "xHCI version %x needs hub " "TT think time and number of ports\n",
@@ -5046,6 +5054,10 @@ static int __init xhci_hcd_init(void)BUILD_BUG_ON (sizeof (struct xhci_intr_reg ) !=8 *32 /8 );/* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */ BUILD_BUG_ON (sizeof (struct xhci_run_regs ) != (8 +8 *128 )*32 /8 ); + +if (usb_disabled ()) +return -ENODEV ; +return 0 ; }
drivers/usb/serial/cp210x.c +1 -0
@@ -160,6 +160,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */ { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */
drivers/usb/serial/ipaq.c +2 -1
@@ -531,7 +531,8 @@ static int ipaq_open(struct tty_struct *tty,* through. Since this has a reasonably high failure rate, we retry * several times. */ -while (retries--) { +while (retries) { + retries--; result =usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ),0x22 ,0x21 ,0x1 ,0 ,NULL ,0 ,100 );
drivers/xen/gntdev.c +1 -1
@@ -804,7 +804,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) vma->vm_ops = &gntdev_vmops; - vma->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP |VM_IO ;if (use_ptemod) vma->vm_flags |=VM_DONTCOPY ;
fs/direct-io.c +10 -1
@@ -1159,6 +1159,16 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, } } +/* Once we sampled i_size check for reads beyond EOF */ + dio->i_size =i_size_read (inode); +if (iov_iter_rw (iter) ==READ && offset >= dio->i_size) { +if (dio->flags &DIO_LOCKING ) +mutex_unlock (&inode->i_mutex); +kmem_cache_free (dio_cache, dio); + retval =0 ; + goto out; + } +/* * For file extending writes updating i_size before data writeouts * complete can expose uninitialized blocks in dumb filesystems.
@@ -1212,7 +1222,6 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, sdio.next_block_for_io =-1 ; dio->iocb = iocb; - dio->i_size =i_size_read (inode);spin_lock_init (&dio->bio_lock); dio->refcount =1 ;
include/linux/filter.h +19 -0
@@ -428,6 +428,25 @@ static inline void bpf_jit_free(struct bpf_prog *fp)#define BPF_ANC BIT(15) +static inline bool bpf_needs_clear_a (const struct sock_filter *first) +{ +switch (first->code) { +case BPF_RET |BPF_K : +case BPF_LD |BPF_W |BPF_LEN : +return false; + +case BPF_LD |BPF_W |BPF_ABS : +case BPF_LD |BPF_H |BPF_ABS : +case BPF_LD |BPF_B |BPF_ABS : +if (first->k ==SKF_AD_OFF +SKF_AD_ALU_XOR_X ) +return true; +return false; + +default : +return true; + } +} +static inline u16 bpf_anc_helper (const struct sock_filter *ftest) {BUG_ON (ftest->code &BPF_ANC );
include/linux/sched.h +1 -0
@@ -802,6 +802,7 @@ struct user_struct {unsigned long mq_bytes;/* How many bytes can be allocated to mqueue? */ #endif unsigned long locked_shm;/* How many pages of mlocked shm ? */ +unsigned long unix_inflight;/* How many files in flight in unix sockets */ #ifdef CONFIG_KEYS struct key *uid_keyring;/* UID specific keyring */
include/linux/skbuff.h +2 -1
@@ -3320,7 +3320,8 @@ struct skb_gso_cb {int encap_level;__u16 csum_start; }; -#define SKB_GSO_CB (skb) ((struct skb_gso_cb *)(skb)->cb) +#define SKB_SGO_CB_OFFSET 32 +#define SKB_GSO_CB (skb) ((struct skb_gso_cb *)((skb)->cb + SKB_SGO_CB_OFFSET))static inline int skb_tnl_header_len (const struct sk_buff *inner_skb) {
include/linux/syscalls.h +1 -1
@@ -524,7 +524,7 @@ asmlinkage long sys_chown(const char __user *filename,asmlinkage long sys_lchown (const char __user *filename,uid_t user,gid_t group);asmlinkage long sys_fchown (unsigned int fd,uid_t user,gid_t group); -#ifdef CONFIG_UID16 +#ifdef CONFIG_HAVE_UID16 asmlinkage long sys_chown16 (const char __user *filename,old_uid_t user,old_gid_t group); asmlinkage long sys_lchown16(const char __user *filename,
include/linux/types.h +1 -1
@@ -35,7 +35,7 @@ typedef __kernel_gid16_t gid16_t;typedef unsigned long uintptr_t ; -#ifdef CONFIG_UID16 +#ifdef CONFIG_HAVE_UID16 /* This is defined by include/asm-{arch}/posix_types.h */ typedef __kernel_old_uid_t old_uid_t ;typedef __kernel_old_gid_t old_gid_t ;
include/linux/usb/cdc_ncm.h +1 -0
@@ -133,6 +133,7 @@ struct cdc_ncm_ctx { };u8 cdc_ncm_select_altsetting (struct usb_interface *intf); +int cdc_ncm_change_mtu (struct net_device *net,int new_mtu);int cdc_ncm_bind_common (struct usbnet *dev,struct usb_interface *intf,u8 data_altsetting);void cdc_ncm_unbind (struct usbnet *dev,struct usb_interface *intf);struct sk_buff *cdc_ncm_fill_tx_frame (struct usbnet *dev,struct sk_buff *skb,__le32 sign);
include/net/inet_ecn.h +16 -3
@@ -111,11 +111,24 @@ static inline void ipv4_copy_dscp(unsigned int dscp, struct iphdr *inner)struct ipv6hdr ; -static inline int IP6_ECN_set_ce (struct ipv6hdr *iph) +/* Note: +* IP_ECN_set_ce() has to tweak IPV4 checksum when setting CE, +* meaning both changes have no effect on skb->csum if/when CHECKSUM_COMPLETE +* In IPv6 case, no checksum compensates the change in IPv6 header, +* so we have to update skb->csum. +*/ +static inline int IP6_ECN_set_ce (struct sk_buff *skb,struct ipv6hdr *iph) { +__be32 from, to; +if (INET_ECN_is_not_ect (ipv6_get_dsfield (iph)))return 0 ; - *(__be32 *)iph |=htonl (INET_ECN_CE <<20 ); + + from = *(__be32 *)iph; + to = from |htonl (INET_ECN_CE <<20 ); + *(__be32 *)iph = to; +if (skb->ip_summed ==CHECKSUM_COMPLETE ) + skb->csum =csum_add (csum_sub (skb->csum, from), to);return 1 ; }
@@ -142,7 +155,7 @@ static inline int INET_ECN_set_ce(struct sk_buff *skb)case cpu_to_be16 (ETH_P_IPV6 ):if (skb_network_header (skb) +sizeof (struct ipv6hdr ) <=skb_tail_pointer (skb)) -return IP6_ECN_set_ce (ipv6_hdr (skb)); +return IP6_ECN_set_ce (skb,ipv6_hdr (skb));break ; }
include/net/inet_timewait_sock.h +13 -1
@@ -112,7 +112,19 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,void __inet_twsk_hashdance (struct inet_timewait_sock *tw,struct sock *sk,struct inet_hashinfo *hashinfo); -void inet_twsk_schedule (struct inet_timewait_sock *tw,const int timeo); +void __inet_twsk_schedule (struct inet_timewait_sock *tw,int timeo, +bool rearm); + +static inline void inet_twsk_schedule (struct inet_timewait_sock *tw,int timeo) +{ +__inet_twsk_schedule (tw, timeo, false); +} + +static inline void inet_twsk_reschedule (struct inet_timewait_sock *tw,int timeo) +{ +__inet_twsk_schedule (tw, timeo, true); +} +void inet_twsk_deschedule (struct inet_timewait_sock *tw); void inet_twsk_purge(struct inet_hashinfo *hashinfo,
kernel/bpf/verifier.c +10 -0
@@ -1019,6 +1019,16 @@ static int check_alu_op(struct reg_state *regs, struct bpf_insn *insn)return -EINVAL ; } +if ((opcode ==BPF_LSH || opcode ==BPF_RSH || + opcode ==BPF_ARSH ) &&BPF_SRC (insn->code) ==BPF_K ) { +int size =BPF_CLASS (insn->code) ==BPF_ALU64 ?64 :32 ; + +if (insn->imm <0 || insn->imm >= size) { +verbose ("invalid shift %d\n" , insn->imm); +return -EINVAL ; + } + } +/* pattern match 'bpf_add Rx, imm' instruction */ if (opcode == BPF_ADD && BPF_CLASS(insn->code) == BPF_ALU64 && regs[insn->dst_reg].type == FRAME_PTR &&
net/batman-adv/bridge_loop_avoidance.c +3 -7
@@ -112,21 +112,17 @@ batadv_backbone_gw_free_ref(struct batadv_bla_backbone_gw *backbone_gw) }/* finally deinitialize the claim */ -static void batadv_claim_free_rcu (struct rcu_head *rcu) +static void batadv_claim_release (struct batadv_bla_claim *claim) { -struct batadv_bla_claim *claim; - - claim = container_of(rcu, struct batadv_bla_claim, rcu); -batadv_backbone_gw_free_ref (claim->backbone_gw); -kfree (claim); +kfree_rcu (claim, rcu); }/* free a claim, call claim_free_rcu if its the last reference */ static void batadv_claim_free_ref (struct batadv_bla_claim *claim) {if (atomic_dec_and_test (&claim->refcount)) -call_rcu (&claim->rcu, batadv_claim_free_rcu); +batadv_claim_release (claim); }/**
net/batman-adv/hard-interface.h +0 -12
@@ -64,18 +64,6 @@ batadv_hardif_free_ref(struct batadv_hard_iface *hard_iface)call_rcu (&hard_iface->rcu, batadv_hardif_free_rcu); } -/** -* batadv_hardif_free_ref_now - decrement the hard interface refcounter and -* possibly free it (without rcu callback) -* @hard_iface: the hard interface to free -*/ -static inline void -batadv_hardif_free_ref_now (struct batadv_hard_iface *hard_iface) -{ -if (atomic_dec_and_test (&hard_iface->refcount)) -batadv_hardif_free_rcu (&hard_iface->rcu); -} -static inline struct batadv_hard_iface *batadv_primary_if_get_selected (struct batadv_priv *bat_priv) {
net/batman-adv/network-coding.c +8 -11
@@ -175,28 +175,25 @@ void batadv_nc_init_orig(struct batadv_orig_node *orig_node) }/** -* batadv_nc_node_free_rcu - rcu callback to free an nc node and remove -* its refcount on the orig_node -* @rcu: rcu pointer of the nc node +* batadv_nc_node_release - release nc_node from lists and queue for free after +* rcu grace period +* @nc_node: the nc node to free */ -static void batadv_nc_node_free_rcu (struct rcu_head *rcu) +static void batadv_nc_node_release (struct batadv_nc_node *nc_node) { -struct batadv_nc_node *nc_node; - - nc_node = container_of(rcu, struct batadv_nc_node, rcu);batadv_orig_node_free_ref (nc_node->orig_node); -kfree (nc_node); +kfree_rcu (nc_node, rcu); }/** -* batadv_nc_node_free_ref - decrements the nc node refcounter and possibly -* frees it +* batadv_nc_node_free_ref - decrement the nc node refcounter and possibly +* release it * @nc_node: the nc node to free */ static void batadv_nc_node_free_ref (struct batadv_nc_node *nc_node) {if (atomic_dec_and_test (&nc_node->refcount)) -call_rcu (&nc_node->rcu, batadv_nc_node_free_rcu); +batadv_nc_node_release (nc_node); }/**
net/batman-adv/originator.c +57 -94
251 lines not on this page · raw message
net/batman-adv/originator.h +0 -1
@@ -25,7 +25,6 @@ int batadv_originator_init(struct batadv_priv *bat_priv);void batadv_originator_free (struct batadv_priv *bat_priv);void batadv_purge_orig_ref (struct batadv_priv *bat_priv);void batadv_orig_node_free_ref (struct batadv_orig_node *orig_node); -void batadv_orig_node_free_ref_now (struct batadv_orig_node *orig_node);struct batadv_orig_node *batadv_orig_node_new (struct batadv_priv *bat_priv,const uint8_t *addr); struct batadv_neigh_node *
net/batman-adv/translation-table.c +13 -15
@@ -219,20 +219,6 @@ int batadv_tt_global_hash_count(struct batadv_priv *bat_priv,return count; } -static void batadv_tt_orig_list_entry_free_rcu (struct rcu_head *rcu) -{ -struct batadv_tt_orig_list_entry *orig_entry; - - orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu); - -/* We are in an rcu callback here, therefore we cannot use -* batadv_orig_node_free_ref() and its call_rcu(): -* An rcu_barrier() wouldn't wait for that to finish -*/ -batadv_orig_node_free_ref_now (orig_entry->orig_node); -kfree (orig_entry); -} -/** * batadv_tt_local_size_mod - change the size by v of the local table identified * by vid
@@ -328,13 +314,25 @@ static void batadv_tt_global_size_dec(struct batadv_orig_node *orig_node,batadv_tt_global_size_mod (orig_node, vid,-1 ); } +/** +* batadv_tt_orig_list_entry_release - release tt orig entry from lists and +* queue for free after rcu grace period +* @orig_entry: tt orig entry to be free'd +*/ +static void +batadv_tt_orig_list_entry_release (struct batadv_tt_orig_list_entry *orig_entry) +{ +batadv_orig_node_free_ref (orig_entry->orig_node); +kfree_rcu (orig_entry, rcu); +} +static void batadv_tt_orig_list_entry_free_ref (struct batadv_tt_orig_list_entry *orig_entry) {if (!atomic_dec_and_test (&orig_entry->refcount))return ; -call_rcu (&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); +batadv_tt_orig_list_entry_release (orig_entry); }/**
net/bridge/br_device.c +8 -0
@@ -28,6 +28,8 @@const struct nf_br_ops __rcu *nf_br_ops__read_mostly ;EXPORT_SYMBOL_GPL (nf_br_ops); +static struct lock_class_key bridge_netdev_addr_lock_key; +/* net device transmit always called with BH disabled */ netdev_tx_t br_dev_xmit (struct sk_buff *skb,struct net_device *dev) {
@@ -87,6 +89,11 @@ out:return NETDEV_TX_OK ; } +static void br_set_lockdep_class (struct net_device *dev) +{ +lockdep_set_class (&dev->addr_list_lock, &bridge_netdev_addr_lock_key); +} +static int br_dev_init (struct net_device *dev) {struct net_bridge *br =netdev_priv (dev);
@@ -99,6 +106,7 @@ static int br_dev_init(struct net_device *dev) err =br_vlan_init (br);if (err)free_percpu (br->stats); +br_set_lockdep_class (dev);return err; }
net/bridge/br_stp_if.c +4 -1
@@ -128,7 +128,10 @@ static void br_stp_start(struct net_bridge *br)char *argv[] = {BR_STP_PROG , br->dev->name,"start" ,NULL };char *envp[] = {NULL }; - r =call_usermodehelper (BR_STP_PROG , argv, envp,UMH_WAIT_PROC ); +if (net_eq (dev_net (br->dev), &init_net)) + r =call_usermodehelper (BR_STP_PROG , argv, envp,UMH_WAIT_PROC ); +else + r = -ENOENT ;spin_lock_bh (&br->lock);
net/core/dev.c +5 -0
@@ -2479,6 +2479,8 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)* * It may return NULL if the skb requires no segmentation. This is * only possible when GSO is used for verifying header integrity. +* +* Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb. */ struct sk_buff *__skb_gso_segment (struct sk_buff *skb,netdev_features_t features,bool tx_path)
@@ -2493,6 +2495,9 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,return ERR_PTR (err); } +BUILD_BUG_ON (SKB_SGO_CB_OFFSET + +sizeof (*SKB_GSO_CB (skb)) >sizeof (skb->cb)); +SKB_GSO_CB (skb)->mac_offset =skb_headroom (skb);SKB_GSO_CB (skb)->encap_level =0 ;
net/core/dst.c +2 -1
@@ -282,10 +282,11 @@ void dst_release(struct dst_entry *dst) {if (dst) {int newrefcnt; +unsigned short nocache = dst->flags &DST_NOCACHE ; newrefcnt =atomic_dec_return (&dst->__refcnt);WARN_ON (newrefcnt <0 ); -if (!newrefcnt &&unlikely (dst->flags &DST_NOCACHE )) +if (!newrefcnt &&unlikely (nocache))call_rcu (&dst->rcu_head, dst_destroy_rcu); } }
net/core/filter.c +5 -0
@@ -775,6 +775,11 @@ int bpf_check_classic(const struct sock_filter *filter, unsigned int flen)if (ftest->k ==0 )return -EINVAL ;break ; +case BPF_ALU |BPF_LSH |BPF_K : +case BPF_ALU |BPF_RSH |BPF_K : +if (ftest->k >=32 ) +return -EINVAL ; +break ;case BPF_LD |BPF_MEM :case BPF_LDX |BPF_MEM :case BPF_ST :
net/dccp/minisocks.c +2 -2
@@ -48,8 +48,6 @@ void dccp_time_wait(struct sock *sk, int state, int timeo) tw->tw_ipv6only = sk->sk_ipv6only; }#endif -/* Linkage updates. */ -__inet_twsk_hashdance (tw, sk, &dccp_hashinfo);/* Get the TIME_WAIT timeout firing. */ if (timeo < rto)
@@ -60,6 +58,8 @@ void dccp_time_wait(struct sock *sk, int state, int timeo) timeo =DCCP_TIMEWAIT_LEN ;inet_twsk_schedule (tw, timeo); +/* Linkage updates. */ +__inet_twsk_hashdance (tw, sk, &dccp_hashinfo);inet_twsk_put (tw); }else {/* Sorry, if we're out of memory, just CLOSE this
net/ipv4/inet_timewait_sock.c +10 -6
@@ -153,13 +153,15 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,/* * Step 2: Hash TW into tcp ehash chain. * Notes : -* - tw_refcnt is set to 3 because : +* - tw_refcnt is set to 4 because : * - We have one reference from bhash chain. * - We have one reference from ehash chain. +* - We have one reference from timer. +* - One reference for ourself (our caller will release it). * We can use atomic_set() because prior spin_lock()/spin_unlock() * committed into memory all tw fields. */ -atomic_set (&tw->tw_refcnt,1 +1 +1 ); +atomic_set (&tw->tw_refcnt,4 );inet_twsk_add_node_rcu (tw, &ehead->chain);/* Step 3: Remove SK from hash chain */
@@ -243,7 +245,7 @@ void inet_twsk_deschedule(struct inet_timewait_sock *tw) }EXPORT_SYMBOL (inet_twsk_deschedule); -void inet_twsk_schedule (struct inet_timewait_sock *tw,const int timeo) +void __inet_twsk_schedule (struct inet_timewait_sock *tw,int timeo,bool rearm) {/* timeout := RTO * 3.5 *
@@ -271,12 +273,14 @@ void inet_twsk_schedule(struct inet_timewait_sock *tw, const int timeo)*/ tw->tw_kill = timeo <=4 *HZ ; -if (!mod_timer_pinned (&tw->tw_timer, jiffies + timeo)) { -atomic_inc (&tw->tw_refcnt); +if (!rearm) { +BUG_ON (mod_timer_pinned (&tw->tw_timer, jiffies + timeo));atomic_inc (&tw->tw_dr->tw_count); + }else { +mod_timer_pending (&tw->tw_timer, jiffies + timeo); } } -EXPORT_SYMBOL_GPL (inet_twsk_schedule); +EXPORT_SYMBOL_GPL (__inet_twsk_schedule);void inet_twsk_purge (struct inet_hashinfo *hashinfo,struct inet_timewait_death_row *twdr,int family)
net/ipv4/ip_output.c +2 -1
@@ -235,6 +235,7 @@ static int ip_finish_output_gso(struct sock *sk, struct sk_buff *skb)* from host network stack. */ features =netif_skb_features (skb); +BUILD_BUG_ON (sizeof (*IPCB (skb)) >SKB_SGO_CB_OFFSET ); segs =skb_gso_segment (skb, features & ~NETIF_F_GSO_MASK );if (IS_ERR_OR_NULL (segs)) {kfree_skb (skb);
@@ -893,7 +894,7 @@ static int __ip_append_data(struct sock *sk,if (((length > mtu) || (skb &&skb_is_gso (skb))) && (sk->sk_protocol ==IPPROTO_UDP ) && (rt->dst.dev->features &NETIF_F_UFO ) && !rt->dst.header_len && - (sk->sk_type ==SOCK_DGRAM )) { + (sk->sk_type ==SOCK_DGRAM ) && !sk->sk_no_check_tx) { err =ip_ufo_append_data (sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, maxfraglen, flags);
net/ipv4/tcp_minisocks.c +6 -7
@@ -163,9 +163,9 @@ kill_with_rst:if (tcp_death_row.sysctl_tw_recycle && tcptw->tw_ts_recent_stamp &&tcp_tw_remember_stamp (tw)) -inet_twsk_schedule (tw, tw->tw_timeout); +inet_twsk_reschedule (tw, tw->tw_timeout);else -inet_twsk_schedule (tw,TCP_TIMEWAIT_LEN ); +inet_twsk_reschedule (tw,TCP_TIMEWAIT_LEN );return TCP_TW_ACK ; }
@@ -203,7 +203,7 @@ kill:return TCP_TW_SUCCESS ; } } -inet_twsk_schedule (tw,TCP_TIMEWAIT_LEN ); +inet_twsk_reschedule (tw,TCP_TIMEWAIT_LEN );if (tmp_opt.saw_tstamp) { tcptw->tw_ts_recent = tmp_opt.rcv_tsval;
@@ -253,7 +253,7 @@ kill:* Do not reschedule in the last case. */ if (paws_reject || th->ack) -inet_twsk_schedule (tw,TCP_TIMEWAIT_LEN ); +inet_twsk_reschedule (tw,TCP_TIMEWAIT_LEN );return tcp_timewait_check_oow_rate_limit ( tw, skb,LINUX_MIB_TCPACKSKIPPEDTIMEWAIT );
@@ -324,9 +324,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) } while (0);#endif -/* Linkage updates. */ -__inet_twsk_hashdance (tw, sk, &tcp_hashinfo); -/* Get the TIME_WAIT timeout firing. */ if (timeo < rto) timeo = rto;
@@ -340,6 +337,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) }inet_twsk_schedule (tw, timeo); +/* Linkage updates. */ +__inet_twsk_hashdance (tw, sk, &tcp_hashinfo);inet_twsk_put (tw); }else {/* Sorry, if we're out of memory, just CLOSE this
net/ipv4/tcp_yeah.c +1 -1
@@ -219,7 +219,7 @@ static u32 tcp_yeah_ssthresh(struct sock *sk) yeah->fast_count =0 ; yeah->reno_count =max (yeah->reno_count>>1 ,2U ); -return tp->snd_cwnd - reduction; +return max_t (int, tp->snd_cwnd - reduction,2 ); }static struct tcp_congestion_ops tcp_yeah__read_mostly = {
net/ipv4/xfrm4_policy.c +37 -9
90 lines not on this page · raw message
net/ipv6/addrconf.c +4 -7
@@ -5267,13 +5267,10 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write, goto out; } -if (!write) { - err =snprintf (str,sizeof (str),"%pI6" , - &secret->secret); -if (err >=sizeof (str)) { - err = -EIO ; - goto out; - } + err =snprintf (str,sizeof (str),"%pI6" , &secret->secret); +if (err >=sizeof (str)) { + err = -EIO ; + goto out; } err =proc_dostring (&lctl, write, buffer, lenp, ppos);
net/ipv6/addrlabel.c +1 -1
@@ -552,7 +552,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh)rcu_read_lock (); p =__ipv6_addr_label (net, addr,ipv6_addr_type (addr), ifal->ifal_index); -if (p &&ip6addrlbl_hold (p)) +if (p && !ip6addrlbl_hold (p)) p =NULL ; lseq = ip6addrlbl_table.seq;rcu_read_unlock ();
net/ipv6/ip6_output.c +1 -1
@@ -1329,7 +1329,7 @@ emsgsize: (skb && skb_is_gso(skb))) && (sk->sk_protocol == IPPROTO_UDP) && (rt->dst.dev->features & NETIF_F_UFO) && - (sk->sk_type == SOCK_DGRAM)) { + (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) { err =ip6_ufo_append_data (sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, mtu, flags, rt);
net/ipv6/tcp_ipv6.c +2 -0
@@ -465,8 +465,10 @@ static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst, fl6->flowlabel =ip6_flowlabel (ipv6_hdr (ireq->pktopts));skb_set_queue_mapping (skb, queue_mapping); +rcu_read_lock (); err =ip6_xmit (sk, skb, fl6,rcu_dereference (np->opt), np->tclass); +rcu_read_unlock (); err =net_xmit_eval (err); }
net/ipv6/xfrm6_mode_tunnel.c +1 -1
@@ -24,7 +24,7 @@ static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)struct ipv6hdr *inner_iph =ipipv6_hdr (skb);if (INET_ECN_is_ce (ipv6_get_dsfield (outer_iph))) -IP6_ECN_set_ce (inner_iph); +IP6_ECN_set_ce (skb, inner_iph); }/* Add encapsulation header.
net/ipv6/xfrm6_policy.c +38 -15
110 lines not on this page · raw message
net/openvswitch/datapath.c +1 -4
@@ -337,12 +337,10 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,unsigned short gso_type =skb_shinfo (skb)->gso_type;struct sw_flow_key later_key;struct sk_buff *segs, *nskb; -struct ovs_skb_cb ovs_cb;int err; - ovs_cb = *OVS_CB (skb); +BUILD_BUG_ON (sizeof (*OVS_CB (skb)) >SKB_SGO_CB_OFFSET ); segs =__skb_gso_segment (skb,NETIF_F_SG , false); - *OVS_CB (skb) = ovs_cb;if (IS_ERR (segs))return PTR_ERR (segs);if (segs ==NULL )
@@ -360,7 +358,6 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,/* Queue all of the segments. */ skb = segs; do { - *OVS_CB(skb) = ovs_cb; if (gso_type & SKB_GSO_UDP && skb != segs) key = &later_key;
net/phonet/af_phonet.c +4 -0
@@ -377,6 +377,10 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev,struct sockaddr_pn sa;u16 len; + skb =skb_share_check (skb,GFP_ATOMIC ); +if (!skb) +return NET_RX_DROP ; +/* check we have at least a full Phonet header */ if (!pskb_pull (skb,sizeof (struct phonethdr ))) goto out;
net/sched/sch_generic.c +3 -1
@@ -666,8 +666,10 @@ static void qdisc_rcu_free(struct rcu_head *head) { struct Qdisc *qdisc = container_of(head, struct Qdisc, rcu_head); -if (qdisc_is_percpu_stats (qdisc)) +if (qdisc_is_percpu_stats (qdisc)) {free_percpu (qdisc->cpu_bstats); +free_percpu (qdisc->cpu_qstats); + }kfree ((char *) qdisc - qdisc->padded); }
net/sctp/sm_sideeffect.c +23 -19
103 lines not on this page · raw message
net/sctp/sm_statefuns.c +4 -2
@@ -4829,7 +4829,8 @@ sctp_disposition_t sctp_sf_do_9_1_prm_abort( retval =SCTP_DISPOSITION_CONSUME ; -sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort)); +if (abort) +sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort));/* Even if we can't send the ABORT due to low memory delete the * TCB. This is a departure from our typical NOMEM handling.
@@ -4966,7 +4967,8 @@ sctp_disposition_t sctp_sf_cookie_wait_prm_abort( SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT)); retval =SCTP_DISPOSITION_CONSUME ; -sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort)); +if (abort) +sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort));sctp_add_cmd_sf (commands,SCTP_CMD_NEW_STATE ,SCTP_STATE (SCTP_STATE_CLOSED ));
net/sctp/socket.c +1 -2
@@ -1513,8 +1513,7 @@ static void sctp_close(struct sock *sk, long timeout)struct sctp_chunk *chunk; chunk =sctp_make_abort_user (asoc,NULL ,0 ); -if (chunk) -sctp_primitive_ABORT (net, asoc, chunk); +sctp_primitive_ABORT (net, asoc, chunk); }else sctp_primitive_SHUTDOWN (net, asoc,NULL ); }
net/sctp/sysctl.c +1 -1
@@ -320,7 +320,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,struct ctl_table tbl;bool changed = false;char *none ="none" ; -char tmp[8 ]; +char tmp[8 ] = {0 };int ret;memset (&tbl,0 ,sizeof (struct ctl_table ));
net/unix/af_unix.c +20 -4
@@ -1481,6 +1481,21 @@ static void unix_destruct_scm(struct sk_buff *skb)sock_wfree (skb); } +/* +* The "user->unix_inflight" variable is protected by the garbage +* collection lock, and we just read it locklessly here. If you go +* over the limit, there might be a tiny race in actually noticing +* it across threads. Tough. +*/ +static inline bool too_many_unix_fds (struct task_struct *p) +{ +struct user_struct *user =current_user (); + +if (unlikely (user->unix_inflight >task_rlimit (p,RLIMIT_NOFILE ))) +return !capable (CAP_SYS_RESOURCE ) && !capable (CAP_SYS_ADMIN ); +return false; +} +#define MAX_RECURSION_LEVEL 4static int unix_attach_fds (struct scm_cookie *scm,struct sk_buff *skb)
@@ -1489,6 +1504,9 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)unsigned char max_level =0 ;int unix_sock_count =0 ; +if (too_many_unix_fds (current)) +return -ETOOMANYREFS ; +for (i = scm->fp->count -1 ; i >=0 ; i--) {struct sock *sk =unix_get_socket (scm->fp->fp[i]);
@@ -1510,10 +1528,8 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)if (!UNIXCB (skb).fp)return -ENOMEM ; -if (unix_sock_count) { -for (i = scm->fp->count -1 ; i >=0 ; i--) -unix_inflight (scm->fp->fp[i]); - } +for (i = scm->fp->count -1 ; i >=0 ; i--) +unix_inflight (scm->fp->fp[i]);return max_level; }
net/unix/garbage.c +8 -5
@@ -120,11 +120,11 @@ void unix_inflight(struct file *fp) {struct sock *s =unix_get_socket (fp); +spin_lock (&unix_gc_lock); +if (s) {struct unix_sock *u =unix_sk (s); -spin_lock (&unix_gc_lock); -if (atomic_long_inc_return (&u->inflight) ==1 ) {BUG_ON (!list_empty (&u->link));list_add_tail (&u->link, &gc_inflight_list);
@@ -132,25 +132,28 @@ void unix_inflight(struct file *fp)BUG_ON (list_empty (&u->link)); } unix_tot_inflight++; -spin_unlock (&unix_gc_lock); } + fp->f_cred->user->unix_inflight++; +spin_unlock (&unix_gc_lock); }void unix_notinflight (struct file *fp) {struct sock *s =unix_get_socket (fp); +spin_lock (&unix_gc_lock); +if (s) {struct unix_sock *u =unix_sk (s); -spin_lock (&unix_gc_lock);BUG_ON (list_empty (&u->link));if (atomic_long_dec_and_test (&u->inflight))list_del_init (&u->link); unix_tot_inflight--; -spin_unlock (&unix_gc_lock); } + fp->f_cred->user->unix_inflight--; +spin_unlock (&unix_gc_lock); } static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),
net/xfrm/xfrm_output.c +2 -0
@@ -153,6 +153,8 @@ static int xfrm_output_gso(struct sock *sk, struct sk_buff *skb) {struct sk_buff *segs; +BUILD_BUG_ON (sizeof (*IPCB (skb)) >SKB_SGO_CB_OFFSET ); +BUILD_BUG_ON (sizeof (*IP6CB (skb)) >SKB_SGO_CB_OFFSET ); segs =skb_gso_segment (skb,0 );kfree_skb (skb);if (IS_ERR (segs))
net/xfrm/xfrm_policy.c +0 -38
@@ -2806,7 +2806,6 @@ static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst,int xfrm_policy_register_afinfo (struct xfrm_policy_afinfo *afinfo) { -struct net *net;int err =0 ;if (unlikely (afinfo ==NULL ))return -EINVAL ;
@@ -2837,26 +2836,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) }spin_unlock (&xfrm_policy_afinfo_lock); -rtnl_lock (); -for_each_net (net) { -struct dst_ops *xfrm_dst_ops; - -switch (afinfo->family) { -case AF_INET : - xfrm_dst_ops = &net->xfrm.xfrm4_dst_ops; -break ; -#if IS_ENABLED (CONFIG_IPV6 ) -case AF_INET6 : - xfrm_dst_ops = &net->xfrm.xfrm6_dst_ops; -break ; -#endif -default : -BUG (); - } - *xfrm_dst_ops = *afinfo->dst_ops; - } -rtnl_unlock (); -return err; }EXPORT_SYMBOL (xfrm_policy_register_afinfo);
@@ -2892,22 +2871,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) }EXPORT_SYMBOL (xfrm_policy_unregister_afinfo); -static void __net_init xfrm_dst_ops_init (struct net *net) -{ -struct xfrm_policy_afinfo *afinfo; - -rcu_read_lock (); - afinfo =rcu_dereference (xfrm_policy_afinfo[AF_INET ]); -if (afinfo) - net->xfrm.xfrm4_dst_ops = *afinfo->dst_ops; -#if IS_ENABLED (CONFIG_IPV6 ) - afinfo =rcu_dereference (xfrm_policy_afinfo[AF_INET6 ]); -if (afinfo) - net->xfrm.xfrm6_dst_ops = *afinfo->dst_ops; -#endif -rcu_read_unlock (); -} -static int xfrm_dev_event (struct notifier_block *this,unsigned long event,void *ptr) {struct net_device *dev =netdev_notifier_info_to_dev (ptr);
@@ -3056,7 +3019,6 @@ static int __net_init xfrm_net_init(struct net *net) rv =xfrm_policy_init (net);if (rv <0 ) goto out_policy; -xfrm_dst_ops_init (net); rv =xfrm_sysctl_init (net);if (rv <0 ) goto out_sysctl;
scripts/recordmcount.c +23 -1
@@ -42,6 +42,7 @@#ifndef EM_AARCH64 #define EM_AARCH64 183 +#define R_AARCH64_NONE 0#define R_AARCH64_ABS64 257#endif
@@ -160,6 +161,22 @@ static int make_nop_x86(void *map, size_t const offset)return 0 ; } +static unsigned char ideal_nop4_arm64[4 ] = {0x1f ,0x20 ,0x03 ,0xd5 }; +static int make_nop_arm64 (void *map,size_t const offset) +{ +uint32_t *ptr; + + ptr = map + offset; +/* bl <_mcount> is 0x94000000 before relocation */ +if (*ptr !=0x94000000 ) +return -1 ; + +/* Convert to nop */ +ulseek (fd_map, offset,SEEK_SET ); +uwrite (fd_map, ideal_nop,4 ); +return 0 ; +} +/* * Get the whole file as a programming convenience in order to avoid * malloc+lseek+read+free of many pieces. If successful, then mmap
@@ -353,7 +370,12 @@ do_file(char const *const fname) altmcount ="__gnu_mcount_nc" ;break ;case EM_AARCH64 : - reltype =R_AARCH64_ABS64 ; gpfx ='_' ;break ; + reltype =R_AARCH64_ABS64 ; + make_nop = make_nop_arm64; + rel_type_nop =R_AARCH64_NONE ; + ideal_nop = ideal_nop4_arm64; + gpfx ='_' ; +break ;case EM_IA_64 : reltype =R_IA64_IMM64 ; gpfx ='_' ;break ;case EM_METAG : reltype =R_METAG_ADDR32 ; altmcount ="_mcount_wrapper" ;
scripts/recordmcount.h +1 -1
@@ -377,7 +377,7 @@ static void nop_mcount(Elf_Shdr const *const relhdr,if (mcountsym ==Elf_r_sym (relp) && !is_fake_mcount (relp)) {if (make_nop) - ret =make_nop ((void *)ehdr, shdr->sh_offset + relp->r_offset); + ret =make_nop ((void *)ehdr,_w (shdr->sh_offset) +_w (relp->r_offset));if (warn_on_notrace_sect && !once) {printf ("Section %s has mcount callers being ignored\n" , txtname);
scripts/recordmcount.pl +2 -1
@@ -263,7 +263,8 @@ if ($arch eq "x86_64") { } elsif ($arch eq "powerpc") { $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)"; - $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?.*?)>:"; + # See comment in the sparc64 section for why we use '\w'. + $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?\\w*?)>:"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s\\.?_mcount\$"; if ($bits == 64) {
sound/core/control.c +2 -0
@@ -1405,6 +1405,8 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,return -EFAULT ;if (tlv.length <sizeof (unsigned int ) *2 )return -EINVAL ; +if (!tlv.numid) +return -EINVAL ;down_read (&card->controls_rwsem); kctl =snd_ctl_find_numid (card, tlv.numid);if (kctl ==NULL ) {
sound/core/hrtimer.c +2 -1
@@ -90,7 +90,7 @@ static int snd_hrtimer_start(struct snd_timer *t)struct snd_hrtimer *stime = t->private_data;atomic_set (&stime->running,0 ); -hrtimer_cancel (&stime->hrt); +hrtimer_try_to_cancel (&stime->hrt);hrtimer_start (&stime->hrt,ns_to_ktime (t->sticks * resolution),HRTIMER_MODE_REL );atomic_set (&stime->running,1 );
@@ -101,6 +101,7 @@ static int snd_hrtimer_stop(struct snd_timer *t) {struct snd_hrtimer *stime = t->private_data;atomic_set (&stime->running,0 ); +hrtimer_try_to_cancel (&stime->hrt);return 0 ; }
sound/core/pcm_compat.c +9 -4
@@ -255,10 +255,15 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,if (! (runtime = substream->runtime))return -ENOTTY ; -/* only fifo_size is different, so just copy all */ - data =memdup_user (data32,sizeof (*data32)); -if (IS_ERR (data)) -return PTR_ERR (data); + data =kmalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + +/* only fifo_size (RO from userspace) is different, so just copy all */ +if (copy_from_user (data, data32,sizeof (*data32))) { + err = -EFAULT ; + goto error; + }if (refine) err =snd_pcm_hw_refine (substream, data);
sound/core/seq/seq_clientmgr.c +1 -1
@@ -1962,7 +1962,7 @@ static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,* No restrictions so for a user client we can clear * the whole fifo */ -if (client->type ==USER_CLIENT )
Lines of this file are not shown. View the raw message.
sound/core/timer.c +82 -18
100 lines not on this page · raw message
sound/pci/hda/hda_intel.c +51 -1
52 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +58 -4
62 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +30 -16
46 lines not on this page · raw message
sound/pci/rme96.c +26 -15
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.