- Linux-stable-mirror - lists.linaro.org

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Greg, Pleae pull commits for Linux 4.18 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit 2724bf10255a5bd0fe578b4a4c7a0f7ab15f73cd: Linux 4.18.15 (2018-10-18 09:18:20 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.18-22102018 for you to fetch changes up to 26d01686996b715dbef1bd134a4ed1917e75e4c5: clk: mvebu: armada-37xx-periph: Remove unused var num_parents (2018-10-18 09:07:56 -0400) - ---------------------------------------------------------------- for-greg-4.18-22102018 - ---------------------------------------------------------------- Alexandre Belloni (1): soc: fsl: qbman: qman: avoid allocating from non existing gen_pool Anders Roxell (1): clk: mvebu: armada-37xx-periph: Remove unused var num_parents Andrei Otcheretianski (2): mac80211: Always report TX status cfg80211: reg: Init wiphy_idx in regulatory_hint_core() Anshuman Khandual (1): mm/migrate.c: split only transparent huge pages when allocation fails Atish Patra (1): RISCV: Fix end PFN for low memory Bob Copeland (1): mac80211: fix pending queue hang due to TX_DROP Colin Ian King (1): drm/i2c: tda9950: fix timeout counter check Dan Carpenter (1): x86/paravirt: Fix some warning messages David Ahern (1): netfilter: bridge: Don't sabotage nf_hook calls from an l3mdev David Howells (4): rxrpc: Fix checks as to whether we should set up a new call rxrpc: Fix RTT gathering rxrpc: Fix transport sockopts to get IPv4 errors on an IPv6 socket rxrpc: Fix error distribution Davide Caratti (1): be2net: don't flip hw_features when VXLANs are added/deleted Florian Fainelli (8): ARM: dts: BCM63xx: Fix incorrect interrupt specifiers asix: Check for supported Wake-on-LAN modes ax88179_178a: Check for supported Wake-on-LAN modes lan78xx: Check for supported Wake-on-LAN modes sr9800: Check for supported Wake-on-LAN modes r8152: Check for supported Wake-on-LAN Modes smsc75xx: Check for Wake-on-LAN modes smsc95xx: Check for Wake-on-LAN modes Florian Westphal (1): netfilter: avoid erronous array bounds warning Guenter Roeck (2): Revert "serial: 8250_dw: Fix runtime PM handling" locking/ww_mutex: Fix runtime warning in the WW mutex selftest Hans Verkuil (1): drm/i2c: tda9950: set MAX_RETRIES for errors only Jiri Olsa (1): perf/ring_buffer: Prevent concurent ring buffer access Johannes Berg (1): mac80211: TDLS: fix skb queue/priority assignment Jouni Malinen (1): cfg80211: Address some corner cases in scan result channel updating Kan Liang (1): perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX Larry Chen (1): ocfs2: fix crash in ocfs2_duplicate_clusters_by_page() Liran Alon (3): KVM: nVMX: Do not expose MPX VMX controls when guest MPX disabled KVM: x86: Do not use kvm_x86_ops->mpx_supported() directly KVM: nVMX: Fix emulation of VM_ENTRY_LOAD_BNDCFGS Lubomir Rintel (1): pxa168fb: prepare the clock Maciej W. Rozycki (1): declance: Fix continuation with the adapter identification message Martin Willi (3): mac80211_hwsim: fix locking when iterating radios during ns exit mac80211_hwsim: fix race in radio destruction from netlink notifier mac80211_hwsim: do not omit multicast announce of first added radio Masashi Honma (2): nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds Masayoshi Mizuma (1): perf/x86/intel/uncore: Use boot_cpu_data.phys_proc_id instead of hardcorded physical package ID 0 Matias Karhumaa (1): Bluetooth: SMP: fix crash in unpairing Michal Simek (1): net: macb: Clean 64b dma addresses if they are not detected Mika Westerberg (2): thunderbolt: Do not handle ICM events after domain is stopped thunderbolt: Initialize after IOMMUs Natarajan, Janakarajan (1): perf/x86/amd/uncore: Set ThreadMask and SliceMask for L3 Cache perf events Nathan Chancellor (5): qed: Avoid implicit enum conversion in qed_set_tunn_cls_info qed: Fix mask parameter in qed_vf_prep_tunn_req_tlv qed: Avoid implicit enum conversion in qed_roce_mode_to_flavor qed: Avoid constant logical operation warning in qed_vf_pf_acquire qed: Avoid implicit enum conversion in qed_iwarp_parse_rx_pkt Nilesh Javali (1): scsi: qedi: Initialize the stats mutex lock Peter Zijlstra (1): perf/core: Fix perf_pmu_unregister() locking Rickard x Andersson (1): net: fec: fix rare tx timeout Sean Tranchetti (1): xfrm: validate template mode Shirish S (1): drm/amd/display: Signal hw_done() after waiting for flip_done() Sowmini Varadhan (2): xfrm: reset transport header back to network header after all input transforms ahave been applied xfrm: reset crypto_done when iterating over multiple input xfrms Srikar Dronamraju (1): powerpc/numa: Skip onlining a offline node in kdump path Steffen Klassert (2): xfrm: Validate address prefix lengths in the xfrm selector. xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry. Steve Capper (1): arm64: hugetlb: Fix handling of young ptes Taehee Yoo (1): netfilter: nft_set_rbtree: add missing rb_erase() in GC routine Thadeu Lima de Souza Cascardo (1): xfrm6: call kfree_skb when skb is toobig Thomas Petazzoni (1): ARM: 8799/1: mm: fix pci_ioremap_io() offset check Wenwen Wang (2): net: cxgb3_main: fix a missing-check bug yam: fix a missing-check bug Yu Zhao (1): cfg80211: fix use-after-free in reg_process_hint() Yuan-Chi Pang (1): mac80211: fix TX status reporting for ieee80211s YueHaibing (1): mm/gup_benchmark: fix unsigned comparison to zero in __gup_benchmark_ioctl Zhao Qiang (1): soc: fsl: qe: Fix copy/paste bug in ucc_get_tdm_sync_shift() zhong jiang (1): netfilter: conntrack: get rid of double sizeof arch/arm/boot/dts/bcm63138.dtsi | 14 +++--- arch/arm/mm/ioremap.c | 2 +- arch/arm64/mm/hugetlbpage.c | 12 +++-- arch/powerpc/mm/numa.c | 5 +- arch/riscv/kernel/setup.c | 2 +- arch/x86/events/amd/uncore.c | 10 ++++ arch/x86/events/intel/uncore_snbep.c | 14 +++--- arch/x86/include/asm/perf_event.h | 8 ++++ arch/x86/kernel/paravirt.c | 4 +- arch/x86/kvm/vmx.c | 39 +++++++++++---- arch/x86/kvm/x86.c | 2 +- drivers/clk/mvebu/armada-37xx-periph.c | 1 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++- drivers/gpu/drm/i2c/tda9950.c | 5 +- drivers/net/ethernet/amd/declance.c | 10 ++-- drivers/net/ethernet/cadence/macb_main.c | 1 + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 17 +++++++ drivers/net/ethernet/emulex/benet/be_main.c | 5 +- drivers/net/ethernet/freescale/fec_main.c | 8 ++-- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_roce.c | 15 ++---- drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_vf.c | 5 +- drivers/net/hamradio/yam.c | 4 ++ drivers/net/usb/asix_common.c | 3 ++ drivers/net/usb/ax88179_178a.c | 3 ++ drivers/net/usb/lan78xx.c | 17 ++----- drivers/net/usb/r8152.c | 3 ++ drivers/net/usb/smsc75xx.c | 3 ++ drivers/net/usb/smsc95xx.c | 3 ++ drivers/net/usb/sr9800.c | 3 ++ drivers/net/wireless/mac80211_hwsim.c | 36 +++++++------- drivers/scsi/qedi/qedi_main.c | 1 + drivers/soc/fsl/qbman/qman.c | 3 ++ drivers/soc/fsl/qe/ucc.c | 2 +- drivers/thunderbolt/icm.c | 49 ++++++++----------- drivers/thunderbolt/nhi.c | 2 +- drivers/tty/serial/8250/8250_dw.c | 4 -- drivers/video/fbdev/pxa168fb.c | 6 +-- fs/ocfs2/refcounttree.c | 16 +++++-- include/linux/netfilter.h | 2 + include/trace/events/rxrpc.h | 4 +- kernel/events/core.c | 11 ++--- kernel/locking/test-ww_mutex.c | 10 ++-- mm/gup_benchmark.c | 3 +- mm/migrate.c | 2 +- net/bluetooth/mgmt.c | 7 +-- net/bluetooth/smp.c | 29 ++++++++++-- net/bluetooth/smp.h | 3 +- net/bridge/br_netfilter_hooks.c | 3 +- net/ipv4/xfrm4_input.c | 1 + net/ipv4/xfrm4_mode_transport.c | 4 +- net/ipv6/xfrm6_input.c | 1 + net/ipv6/xfrm6_mode_transport.c | 4 +- net/ipv6/xfrm6_output.c | 2 + net/mac80211/mesh.h | 3 +- net/mac80211/mesh_hwmp.c | 9 ++-- net/mac80211/status.c | 11 ++--- net/mac80211/tdls.c | 8 ++-- net/mac80211/tx.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 4 +- net/netfilter/nft_set_rbtree.c | 28 +++++------ net/rxrpc/ar-internal.h | 15 ++++-- net/rxrpc/call_object.c | 2 +- net/rxrpc/conn_client.c | 4 +- net/rxrpc/conn_object.c | 4 +- net/rxrpc/input.c | 20 ++++---- net/rxrpc/local_object.c | 32 +++++++++---- net/rxrpc/output.c | 31 +++++++----- net/rxrpc/peer_event.c | 46 +++++------------- net/rxrpc/peer_object.c | 17 ------- net/wireless/nl80211.c | 20 ++++++-- net/wireless/reg.c | 8 ++-- net/wireless/scan.c | 58 +++++++++++++++++++---- net/xfrm/xfrm_input.c | 1 + net/xfrm/xfrm_output.c | 4 ++ net/xfrm/xfrm_policy.c | 4 ++ net/xfrm/xfrm_user.c | 15 ++++++ 78 files changed, 467 insertions(+), 318 deletions(-) -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAlvNlLQACgkQ3qZv95d3 LNxG5hAAgi9FdHk+dLze0f1V4fd/rG6YdwqOF7/YZz9FWZEib+eMLs18oSMcR/K3 SAs001XwWxJCy4OdLlYvFDqZU8np+RxzG4ol6Y6GRrpiVYSxHVbVjpBbsl2SW98M b1TnAPpHtF7z6720AXZo1EvgJ/yVQvWUtU7eiiGPYxrsfMTyYhttNtPnzsf43FNr il+HyOwdgLcRvbzO6SbaGv2Qmvy6KwZFyU8E4oOdQ7HmHEhE5/Om5jo9BSxie/KK OilDy0LfzziUI1KelewK2c6Zk9lbxzyVEhGXiCs+fKj6EbHTwNXrEAzXuQw7ZJgz hkHH1Beve24kyp4YpJQsq/bWJfFA4WTXmuDVU4fdMsOOKnm5/Xm4hnpFHRINRElj r9ZB1QveLi+8MZWi4JLi6MRh6dqE53DX8refwdljut3RdDTMiVapEoyhkFlyMZzh TJgB5PLFcRWWd5I6hI384eUrdfvgbusRwysMvxJOoBr/ddk6c4XDqMaGmUCnLSt8 ORZ0mFhV6VKrK8/y0LRhRjDTjGppYAuCDpbLw4SmZsTmyohLg1gubk8mGXDA+hqk ZMoFO67t1Sy8UiwLLJGL+XUkDnWUhWpKFynVgtTTCRcMKuqnmaHHC+s8v5nIsczh 7WLYCE3wISy1ug7i0Ew9qoMj7/gihrIUjtmpsnFtnvTgOqDj00A= =Zxve -----END PGP SIGNATURE-----

7 years

1
0
0 0

[PATCH v5] selinux: policydb - fix byte order and alignment issues

by Ondrej Mosnacek

Do the LE conversions before doing the Infiniband-related range checks. The incorrect checks are otherwise causing a failure to load any policy with an ibendportcon rule on BE systems. This can be reproduced by running (on e.g. ppc64): cat >my_module.cil <<EOF (type test_ibendport_t) (roletype object_r test_ibendport_t) (ibendportcon mlx4_0 1 (system_u object_r test_ibendport_t ((s0) (s0)))) EOF semodule -i my_module.cil Also, fix loading/storing the 64-bit subnet prefix for OCON_IBPKEY to use a correctly aligned buffer. Finally, do not use the 'nodebuf' (u32) buffer where 'buf' (__le32) should be used instead. Tested internally on a ppc64 machine with a RHEL 7 kernel with this patch applied. Cc: Daniel Jurgens <danielj(a)mellanox.com> Cc: Eli Cohen <eli(a)mellanox.com> Cc: James Morris <jmorris(a)namei.org> Cc: Doug Ledford <dledford(a)redhat.com> Cc: <stable(a)vger.kernel.org> # 4.13+ Fixes: a806f7a1616f ("selinux: Create policydb version for Infiniband support") Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- security/selinux/ss/policydb.c | 51 ++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 15 deletions(-) Changes in v5: - defer also assignment to 8-bit ibendport.port Changes in v4: - defer assignment to 16-bit struct fields to after the range check Changes in v3: - use separate buffer for the 64-bit subnet_prefix - add comments on the byte ordering of subnet_prefix - deduplicate the le32_to_cpu() calls from checks Changes in v2: - add reproducer to commit message - update e-mail address of James Morris - better Cc also the old SELinux ML diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index f4eadd3f7350..d7e8126f32dc 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -2108,6 +2108,7 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, { int i, j, rc; u32 nel, len; + __be64 prefixbuf[1]; __le32 buf[3]; struct ocontext *l, *c; u32 nodebuf[8]; @@ -2217,21 +2218,30 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, goto out; break; } - case OCON_IBPKEY: - rc = next_entry(nodebuf, fp, sizeof(u32) * 4); + case OCON_IBPKEY: { + u32 pkey_lo, pkey_hi; + + rc = next_entry(prefixbuf, fp, sizeof(u64)); + if (rc) + goto out; + + /* we need to have subnet_prefix in CPU order */ + c->u.ibpkey.subnet_prefix = be64_to_cpu(prefixbuf[0]); + + rc = next_entry(buf, fp, sizeof(u32) * 2); if (rc) goto out; - c->u.ibpkey.subnet_prefix = be64_to_cpu(*((__be64 *)nodebuf)); + pkey_lo = le32_to_cpu(buf[0]); + pkey_hi = le32_to_cpu(buf[1]); - if (nodebuf[2] > 0xffff || - nodebuf[3] > 0xffff) { + if (pkey_lo > U16_MAX || pkey_hi > U16_MAX) { rc = -EINVAL; goto out; } - c->u.ibpkey.low_pkey = le32_to_cpu(nodebuf[2]); - c->u.ibpkey.high_pkey = le32_to_cpu(nodebuf[3]); + c->u.ibpkey.low_pkey = pkey_lo; + c->u.ibpkey.high_pkey = pkey_hi; rc = context_read_and_validate(&c->context[0], p, @@ -2239,7 +2249,10 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, if (rc) goto out; break; - case OCON_IBENDPORT: + } + case OCON_IBENDPORT: { + u32 port; + rc = next_entry(buf, fp, sizeof(u32) * 2); if (rc) goto out; @@ -2249,12 +2262,13 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, if (rc) goto out; - if (buf[1] > 0xff || buf[1] == 0) { + port = le32_to_cpu(buf[1]); + if (port > 0xff || port == 0) { rc = -EINVAL; goto out; } - c->u.ibendport.port = le32_to_cpu(buf[1]); + c->u.ibendport.port = port; rc = context_read_and_validate(&c->context[0], p, @@ -2262,7 +2276,8 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, if (rc) goto out; break; - } + } /* end case */ + } /* end switch */ } } rc = 0; @@ -3105,6 +3120,7 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, { unsigned int i, j, rc; size_t nel, len; + __be64 prefixbuf[1]; __le32 buf[3]; u32 nodebuf[8]; struct ocontext *c; @@ -3192,12 +3208,17 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, return rc; break; case OCON_IBPKEY: - *((__be64 *)nodebuf) = cpu_to_be64(c->u.ibpkey.subnet_prefix); + /* subnet_prefix is in CPU order */ + prefixbuf[0] = cpu_to_be64(c->u.ibpkey.subnet_prefix); - nodebuf[2] = cpu_to_le32(c->u.ibpkey.low_pkey); - nodebuf[3] = cpu_to_le32(c->u.ibpkey.high_pkey); + rc = put_entry(prefixbuf, sizeof(u64), 1, fp); + if (rc) + return rc; + + buf[0] = cpu_to_le32(c->u.ibpkey.low_pkey); + buf[1] = cpu_to_le32(c->u.ibpkey.high_pkey); - rc = put_entry(nodebuf, sizeof(u32), 4, fp); + rc = put_entry(buf, sizeof(u32), 2, fp); if (rc) return rc; rc = context_write(p, &c->context[0], fp); -- 2.17.2

7 years

1
0
0 0

Linux 3.16.60

by Ben Hutchings

I'm announcing the release of the 3.16.60 kernel. All users of the 3.16 kernel series should upgrade. The updated 3.16.y git tree can be found at: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.16.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 The diff from 3.16.59 is attached to this message. Ben. ------------ Documentation/networking/ppp_generic.txt | 6 - Makefile | 2 +- arch/arc/include/asm/Kbuild | 1 + arch/arm/boot/compressed/head.S | 16 +- arch/arm/boot/compressed/misc.c | 9 +- arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- arch/arm/crypto/Makefile | 2 + arch/arm/include/asm/assembler.h | 10 + arch/arm/kernel/traps.c | 5 +- arch/arm/kvm/arm.c | 15 +- arch/arm/lib/getuser.S | 4 + arch/arm/mach-davinci/board-dm646x-evm.c | 3 +- arch/arm/mach-keystone/pm_domain.c | 1 + arch/avr32/include/asm/Kbuild | 1 + arch/blackfin/include/asm/Kbuild | 1 + arch/c6x/include/asm/Kbuild | 1 + arch/cris/include/asm/Kbuild | 1 + arch/frv/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/ia64/include/asm/Kbuild | 1 + arch/m32r/include/asm/Kbuild | 1 + arch/metag/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/Kbuild | 1 + arch/mips/include/asm/uaccess.h | 11 +- arch/mips/kernel/ptrace.c | 24 ++- arch/mips/kernel/ptrace32.c | 6 +- arch/mips/kvm/kvm_mips.c | 2 +- arch/mips/lib/memset.S | 11 +- arch/mn10300/include/asm/Kbuild | 1 + arch/parisc/kernel/drivers.c | 4 + arch/parisc/kernel/hpmc.S | 6 +- arch/powerpc/include/asm/barrier.h | 3 +- arch/powerpc/include/asm/opal.h | 3 + arch/powerpc/include/asm/synch.h | 4 - arch/powerpc/kernel/cpu_setup_power.S | 4 + arch/powerpc/kernel/eeh_driver.c | 61 ++++-- arch/powerpc/kernel/eeh_pe.c | 3 +- arch/powerpc/lib/feature-fixups.c | 2 +- arch/powerpc/mm/hugetlbpage.c | 17 +- arch/powerpc/platforms/powernv/opal-nvram.c | 21 +- arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/Kbuild | 1 + arch/s390/kernel/ipl.c | 1 + arch/s390/kernel/perf_cpum_sf.c | 4 + arch/score/include/asm/Kbuild | 1 + arch/tile/include/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/um/os-Linux/signal.c | 2 +- arch/unicore32/include/asm/Kbuild | 1 + arch/x86/boot/compressed/eboot.c | 6 +- arch/x86/crypto/cast5_avx_glue.c | 3 +- arch/x86/include/asm/apic.h | 4 +- arch/x86/include/asm/x2apic.h | 2 +- arch/x86/kernel/acpi/boot.c | 18 +- arch/x86/kernel/apic/apic_numachip.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- arch/x86/kernel/cpu/perf_event.c | 8 +- arch/x86/kernel/machine_kexec_32.c | 6 +- arch/x86/kernel/machine_kexec_64.c | 4 +- arch/x86/kernel/smpboot.c | 2 + arch/x86/kernel/tsc.c | 2 +- arch/x86/kvm/x86.c | 7 +- arch/x86/mm/dump_pagetables.c | 10 +- arch/x86/net/bpf_jit_comp.c | 3 +- arch/x86/um/stub_segv.c | 2 +- arch/x86/xen/mmu.c | 6 +- arch/xtensa/include/asm/Kbuild | 1 + crypto/af_alg.c | 8 +- crypto/ahash.c | 7 +- drivers/ata/ahci.c | 1 + drivers/ata/libata-core.c | 8 + drivers/atm/zatm.c | 3 + drivers/base/regmap/regmap.c | 22 +- drivers/char/virtio_console.c | 157 +++++++------- drivers/gpu/drm/drm_fops.c | 1 + drivers/gpu/drm/i915/i915_cmd_parser.c | 80 ++++--- drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_gem_userptr.c | 3 + drivers/gpu/drm/i915/intel_hdmi.c | 14 +- drivers/gpu/drm/i915/intel_lvds.c | 11 +- drivers/gpu/drm/msm/msm_gem.c | 30 ++- drivers/gpu/drm/radeon/radeon_device.c | 15 +- drivers/gpu/drm/radeon/si_dpm.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 10 +- drivers/hid/hid-core.c | 12 +- drivers/hid/hidraw.c | 5 + drivers/hid/i2c-hid/i2c-hid.c | 13 +- drivers/hwmon/nct6683.c | 4 +- drivers/hwmon/nct6775.c | 10 +- drivers/hwmon/pmbus/adm1275.c | 4 +- drivers/hwmon/pmbus/max8688.c | 2 +- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-viperboard.c | 2 +- drivers/iio/kfifo_buf.c | 11 +- drivers/infiniband/core/addr.c | 16 ++ drivers/infiniband/core/iwpm_util.c | 5 +- drivers/infiniband/core/ucma.c | 43 ++-- drivers/infiniband/hw/cxgb4/cq.c | 11 +- drivers/infiniband/hw/cxgb4/device.c | 8 + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 6 +- drivers/infiniband/hw/cxgb4/qp.c | 4 +- drivers/infiniband/hw/cxgb4/resource.c | 26 ++- drivers/infiniband/hw/mlx5/qp.c | 39 ++-- drivers/infiniband/ulp/srp/ib_srp.c | 8 +- drivers/input/serio/i8042-x86ia64io.h | 24 +++ drivers/media/pci/cx25821/cx25821-core.c | 7 +- drivers/media/platform/s3c-camif/camif-capture.c | 7 +- drivers/media/rc/rc-main.c | 4 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 +- drivers/message/fusion/mptsas.c | 1 + drivers/mmc/host/jz4740_mmc.c | 2 +- drivers/mtd/chips/cfi_cmdset_0001.c | 33 ++- drivers/mtd/chips/cfi_cmdset_0002.c | 9 +- drivers/mtd/ubi/block.c | 2 +- drivers/mtd/ubi/build.c | 11 + drivers/net/bonding/bond_main.c | 3 +- drivers/net/can/usb/kvaser_usb.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 11 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 +- drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 16 ++ drivers/net/ethernet/mellanox/mlx4/main.c | 4 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 4 +- drivers/net/ethernet/ti/cpsw.c | 13 +- drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 62 ++++-- drivers/net/ppp/ppp_generic.c | 136 +++++++----- drivers/net/ppp/pppoe.c | 4 + drivers/net/team/team.c | 38 +++- drivers/net/usb/qmi_wwan.c | 13 ++ drivers/net/vmxnet3/vmxnet3_drv.c | 137 ++++++++---- drivers/net/vmxnet3/vmxnet3_int.h | 8 +- drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +- drivers/parport/parport_pc.c | 4 + drivers/pci/hotplug/acpiphp_glue.c | 23 +- drivers/pci/quirks.c | 13 ++ drivers/pinctrl/pinctrl-single.c | 22 +- drivers/rtc/rtc-snvs.c | 15 +- drivers/rtc/rtc-tx4939.c | 6 +- drivers/s390/block/dasd_alias.c | 16 +- drivers/s390/cio/chsc.c | 14 +- drivers/s390/cio/qdio_main.c | 42 ++-- drivers/s390/cio/qdio_setup.c | 12 +- drivers/s390/net/qeth_core_main.c | 8 +- drivers/s390/scsi/zfcp_dbf.c | 23 +- drivers/s390/scsi/zfcp_ext.h | 5 +- drivers/s390/scsi/zfcp_scsi.c | 14 +- drivers/scsi/qla2xxx/qla_init.c | 3 +- drivers/scsi/sd.c | 2 + drivers/staging/line6/midi.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 2 + drivers/staging/usbip/usbip_common.h | 2 +- drivers/staging/usbip/vhci_hcd.c | 8 +- drivers/thermal/imx_thermal.c | 19 +- drivers/tty/Makefile | 3 +- drivers/tty/n_null.c | 80 +++++++ drivers/tty/pty.c | 21 +- drivers/tty/serial/altera_uart.c | 6 +- drivers/tty/serial/arc_uart.c | 8 +- drivers/tty/serial/fsl_lpuart.c | 4 + drivers/tty/serial/imx.c | 6 + drivers/tty/serial/mxs-auart.c | 5 + drivers/tty/serial/pxa.c | 4 + drivers/tty/serial/xilinx_uartps.c | 2 +- drivers/tty/tty_io.c | 42 ++-- drivers/tty/tty_ldisc.c | 68 +++--- drivers/tty/vt/vt.c | 6 +- drivers/usb/core/config.c | 4 +- drivers/usb/core/generic.c | 9 +- drivers/usb/core/hcd.c | 1 + drivers/usb/core/hub.c | 10 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/dwc3-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 5 +- drivers/usb/musb/musb_gadget_ep0.c | 14 +- drivers/usb/musb/musb_host.c | 4 +- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/ftdi_sio.c | 5 +- drivers/usb/serial/ftdi_sio_ids.h | 9 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/serial/visor.c | 69 +++--- drivers/video/fbdev/stifb.c | 2 +- drivers/watchdog/f71808e_wdt.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- drivers/xen/xen-acpi-processor.c | 6 +- fs/affs/namei.c | 10 +- fs/afs/security.c | 13 +- fs/aio.c | 7 +- fs/autofs4/root.c | 2 +- fs/btrfs/ctree.c | 16 +- fs/btrfs/extent-tree.c | 1 + fs/btrfs/inode.c | 231 +++++++++++++------- fs/btrfs/ioctl.c | 22 +- fs/btrfs/tests/qgroup-tests.c | 2 +- fs/btrfs/tree-log.c | 12 +- fs/buffer.c | 2 +- fs/ceph/inode.c | 10 +- fs/cifs/cifsfs.c | 13 ++ fs/cifs/dir.c | 9 +- fs/cifs/smb2pdu.c | 49 +++-- fs/dcache.c | 22 ++ fs/ecryptfs/inode.c | 3 +- fs/ext2/inode.c | 10 - fs/ext2/namei.c | 6 +- fs/ext3/namei.c | 6 +- fs/ext4/balloc.c | 3 +- fs/ext4/dir.c | 8 +- fs/ext4/ialloc.c | 43 +--- fs/ext4/indirect.c | 5 +- fs/ext4/namei.c | 6 +- fs/ext4/xattr.c | 86 +++++--- fs/ext4/xattr.h | 11 + fs/f2fs/f2fs.h | 1 + fs/f2fs/gc.c | 2 +- fs/f2fs/inode.c | 23 ++ fs/f2fs/namei.c | 52 ++--- fs/fs-writeback.c | 2 +- fs/hugetlbfs/inode.c | 10 +- fs/jbd2/journal.c | 5 +- fs/jbd2/transaction.c | 1 + fs/jffs2/dir.c | 12 +- fs/jffs2/super.c | 2 +- fs/jfs/namei.c | 12 +- fs/namespace.c | 3 +- fs/nilfs2/namei.c | 6 +- fs/notify/fanotify/fanotify.c | 34 ++- fs/ocfs2/dlm/dlmcommon.h | 1 + fs/ocfs2/dlm/dlmdomain.c | 15 ++ fs/ocfs2/dlm/dlmrecovery.c | 13 +- fs/proc/proc_sysctl.c | 3 + fs/reiserfs/journal.c | 2 +- fs/reiserfs/namei.c | 12 +- fs/ubifs/super.c | 14 +- fs/udf/ialloc.c | 7 +- fs/udf/namei.c | 106 ++++----- fs/ufs/ialloc.c | 6 +- fs/ufs/namei.c | 14 +- include/asm-generic/word-at-a-time.h | 80 ++++++- include/linux/clk-provider.h | 3 +- include/linux/dcache.h | 1 + include/linux/efi.h | 8 +- include/linux/hid.h | 4 +- include/linux/iio/buffer.h | 6 +- include/linux/log2.h | 13 +- include/linux/msg.h | 4 +- include/linux/mtd/flashchip.h | 1 + include/linux/shm.h | 4 +- include/linux/string.h | 3 + include/linux/tty.h | 6 +- include/linux/virtio.h | 3 + include/net/dst.h | 1 + include/net/inet_timewait_sock.h | 1 + include/net/nexthop.h | 2 +- include/rdma/ib_addr.h | 2 + include/sound/control.h | 7 +- include/sound/pcm_oss.h | 1 + include/trace/events/xen.h | 16 -- include/uapi/linux/ppp-ioctl.h | 2 +- include/uapi/linux/tty.h | 1 + ipc/msg.c | 19 +- ipc/msgutil.c | 2 +- ipc/sem.c | 38 ++-- ipc/shm.c | 116 +++++++--- ipc/util.c | 9 + ipc/util.h | 11 + kernel/resource.c | 3 +- kernel/sched/auto_group.c | 9 +- kernel/sched/core.c | 3 + kernel/sys.c | 4 + kernel/time/clocksource.c | 2 + kernel/time/tick-broadcast.c | 8 + kernel/trace/trace_events_filter.c | 3 + kernel/trace/trace_events_trigger.c | 5 +- kernel/trace/trace_uprobe.c | 32 ++- kernel/tracepoint.c | 4 +- lib/string.c | 88 ++++++++ mm/filemap.c | 7 +- mm/mmap.c | 32 +++ net/atm/lec.c | 9 +- net/batman-adv/translation-table.c | 93 ++++++-- net/bridge/netfilter/ebtables.c | 3 +- net/ceph/messenger.c | 7 + net/compat.c | 6 +- net/core/dev.c | 3 +- net/core/dev_addr_lists.c | 4 +- net/core/neighbour.c | 30 ++- net/core/skbuff.c | 1 + net/dccp/ccids/ccid2.c | 14 +- net/dccp/timer.c | 2 +- net/dns_resolver/dns_key.c | 14 +- net/ipv4/inet_timewait_sock.c | 1 + net/ipv4/ip_output.c | 3 +- net/ipv4/ip_tunnel.c | 17 +- net/ipv4/ping.c | 7 +- net/ipv4/route.c | 118 +++++----- net/ipv4/tcp.c | 8 +- net/ipv4/tcp_input.c | 7 +- net/ipv4/tcp_output.c | 7 +- net/ipv4/udp.c | 7 +- net/ipv6/ip6_gre.c | 8 +- net/ipv6/ip6_output.c | 3 +- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/ip6_vti.c | 7 +- net/ipv6/route.c | 2 + net/ipv6/sit.c | 8 +- net/ipv6/xfrm6_policy.c | 2 +- net/l2tp/l2tp_core.c | 260 ++++++++++------------- net/l2tp/l2tp_core.h | 7 +- net/l2tp/l2tp_debugfs.c | 18 +- net/l2tp/l2tp_netlink.c | 28 ++- net/l2tp/l2tp_ppp.c | 43 +++- net/llc/af_llc.c | 17 +- net/netfilter/ipvs/ip_vs_core.c | 8 + net/netfilter/ipvs/ip_vs_ctl.c | 15 +- net/netfilter/ipvs/ip_vs_sync.c | 10 +- net/netfilter/nf_tables_api.c | 59 ++--- net/netlink/af_netlink.c | 2 + net/packet/af_packet.c | 86 +++++--- net/packet/internal.h | 10 +- net/rfkill/rfkill-gpio.c | 7 +- net/sched/sch_fq.c | 37 ++-- net/sctp/inqueue.c | 2 +- net/sctp/ipv6.c | 65 +++--- net/sunrpc/rpc_pipe.c | 1 + security/selinux/ss/services.c | 2 +- sound/core/control_compat.c | 3 +- sound/core/oss/pcm_oss.c | 186 ++++++++++++---- sound/core/pcm.c | 8 +- sound/core/pcm_compat.c | 2 + sound/core/pcm_native.c | 1 + sound/core/rawmidi_compat.c | 18 +- sound/core/seq/oss/seq_oss_event.c | 15 +- sound/core/seq/oss/seq_oss_midi.c | 2 + sound/core/seq/oss/seq_oss_synth.c | 85 ++++---- sound/core/seq/oss/seq_oss_synth.h | 3 +- sound/core/seq/seq_virmidi.c | 4 +- sound/core/timer.c | 222 +++++++++---------- sound/drivers/aloop.c | 17 +- sound/drivers/opl3/opl3_synth.c | 7 +- sound/pci/asihpi/hpimsginit.c | 39 ++-- sound/pci/asihpi/hpioctl.c | 4 +- sound/pci/hda/hda_hwdep.c | 12 +- sound/pci/rme9652/hdspm.c | 24 ++- sound/pci/rme9652/rme9652.c | 6 +- sound/soc/codecs/ssm2602.c | 19 +- sound/soc/fsl/fsl_esai.c | 7 + sound/usb/mixer.c | 8 + sound/usb/mixer_maps.c | 3 + tools/perf/Documentation/perf-top.txt | 3 + tools/perf/builtin-record.c | 2 +- 354 files changed, 3603 insertions(+), 1941 deletions(-) Aaron Ma (2): HID: i2c-hid: fix size check and type usage HID: core: Fix size as type u32 Al Viro (12): hypfs_kill_super(): deal with failed allocations jffs2_kill_sb(): deal with failed allocations rpc_pipefs: fix double-dput() Don't leak MNT_INTERNAL away from internal mounts udf: merge the pieces inserting a new non-directory object into directory udf: fix the udf_iget() vs. udf_new_inode() races ufs: deal with nfsd/iget races do d_instantiate/unlock_new_inode combinations safely affs_lookup(): close a race with affs_remove_link() ext2: fix a block leak aio: fix io_destroy(2) vs. lookup_ioctx() race fix io_destroy()/aio_complete() race Alan Cox (1): tty: handle the case where we cannot restore a line discipline Alan Stern (1): USB: Accept bulk endpoints with 1024-byte maxpacket Alex Smith (1): mmc: jz4740: Fix race condition in IRQ mask update Alexander Gerasiov (1): parport_pc: Add support for WCH CH382L PCI-E single parallel port card. Alexey Khoroshilov (2): vmxnet3: fix checks for dma mapping errors vmxnet3: avoid assumption about invalid dma_pa in vmxnet3_set_mc() Amir Goldstein (1): fanotify: fix logic of events on child Andrew Morton (1): fs/reiserfs/journal.c: add missing resierfs_warning() arg Andrey Ignatov (1): ipv4: fix memory leaks in udp_sendmsg, ping_v4_sendmsg Andy King (1): VMXNET3: Check for map error in vmxnet3_set_mc Aneesh Kumar K.V (1): powerpc/mm/hugetlb: initialize the pagetable cache correctly for hugetlb Ard Biesheuvel (1): efi: Avoid potential crashes, fix the 'struct efi_pci_io_protocol_32' definition for mixed mode Arnaldo Carvalho de Melo (1): perf top: Document --ignore-vmlinux Arnd Bergmann (1): media: s3c-camif: fix out-of-bounds array access Bai Ping (1): thermal: imx: register irq handler later in probe Bart Van Assche (1): IB/srp: Fix srp_abort() Ben Hutchings (5): scsi: qla2xxx: Avoid double completion of abort command drm/msm: Fix possible null dereference on failure of get_pages() ALSA: timer: Fix pause event notification ppp: Fix null pointer dereference on registration failure Linux 3.16.60 Bharat Potnuri (1): iw_cxgb4: Atomically flush per QP HW CQEs Bin Liu (1): usb: musb: host: fix potential NULL pointer dereference Bjorn Helgaas (1): drm/radeon: make MacBook Pro d3_delay quirk more generic Bjørn Mork (1): qmi_wwan: do not steal interfaces from class drivers Brad Volkin (1): drm/i915: Log a message when rejecting LRM to OACONTROL Bryan O'Donoghue (1): rtc: snvs: Fix usage of snvs_rtc_enable Chao Yu (2): f2fs: reposition unlock_new_inode to prevent accessing invalid inode udf: avoid unneeded up_write when fail to add entry in ->symlink Charles Keepax (2): regmap: Correct offset handling in regmap_volatile_range regmap: Don't use format_val in regmap_bulk_read Chris Mason (1): Btrfs: use insert_inode_locked4 for inode creation Chris Metcalf (3): Make asm/word-at-a-time.h available on all architectures word-at-a-time.h: fix some Kbuild files string: provide strscpy() Clemens Werther (1): USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator Colin Ian King (5): media: cx25821: prevent out-of-bounds read on array card rtc: tx4939: avoid unintended sign extension on a 24 bit shift staging: rtl8192u: return -ENOMEM on failed allocation of priv->oldaddr RDMA/iwpm: fix memory leak on map_info KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable" Collin May (1): USB: serial: simple: add libtransistor console Cong Wang (2): llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (2): xen/acpi: off by one in read_acpi_id() net: ethernet: davinci_emac: fix error handling in probe() Daniel Borkmann (1): bpf, x64: fix memleak when not converging after image Danilo Krummrich (1): fs/proc/proc_sysctl.c: fix potential page fault while unregistering sysctl table Danit Goldberg (1): IB/mlx5: Use unlimited rate when static rate is not supported Dave Airlie (1): drm: set FMODE_UNSIGNED_OFFSET for drm files David Henningsson (1): ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr David Howells (1): afs: Fix directory permissions check David Lechner (1): pinctrl: pinctrl-single: Fix pcs_request_gpio() when bits_per_mux != 0 Davidlohr Bueso (5): ipc,shm: move BUG_ON check into shm_lock ipc: convert invalid scenarios to use WARN_ON ipc/sem: make semctl setting sempid consistent Revert "ipc/shm: Fix shmat mmap nil-page protection" ipc/shm: fix shmat() nil address after round-down when remapping Dennis Wassenberg (1): Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list Dexuan Cui (1): tick/broadcast: Use for_each_cpu() specially on UP kernels Dmitry Safonov (1): tracing/uprobe: Drop isdigit() check in create_trace_uprobe Dou Liyang (1): x86/acpi: Prevent X2APIC id 0xffffffff from being accounted Eliot Blennerhassett (1): ALSA: asihpi: used parts of message/response are zeroed before use Eric Biggers (5): crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one ipc/shm: fix use-after-free of shm file via remap_file_pages() ext4: correctly detect when an xattr value has an invalid size KEYS: DNS: limit the length of option strings ppp: remove the PPPIOCDETACH ioctl Eric Dumazet (21): ip_tunnel: better validate user provided tunnel names ipv6: sit: better validate user provided tunnel names ip6_gre: better validate user provided tunnel names ip6_tunnel: better validate user provided tunnel names vti6: better validate user provided tunnel names crypto: af_alg - fix possible uninit-value in alg_bind() netlink: fix uninit-value in netlink_sendmsg net: fix rtnh_ok() net: initialize skb->peeked when cloning net: fix uninit-value in __hw_addr_add_ex() soreuseport: initialise timewait reuseport field sctp: do not leak kernel memory to user space tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: af_packet: fix race in PACKET_{R|T}X_RING ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy tcp: fix TCP_REPAIR_QUEUE bound checking net_sched: fq: take care of throttled flows before reuse dccp: fix tasklet usage llc: better deal with too small mtu xfrm6: avoid potential infinite loop in _decode_session6() tcp: purge write queue in tcp_connect_init() Eric W. Biederman (4): ipc/util: Helpers for making the sysvipc operations pid namespace aware ipc/shm: Fix shmctl(..., IPC_STAT, ...) between pid namespaces. ipc/msg: Fix msgctl(..., IPC_STAT, ...) between pid namespaces ipc/sem: Fix semctl(..., GETPID, ...) between pid namespaces Eryu Guan (1): ext4: protect i_disksize update by i_data_sem in direct write path Fabián Inostroza (1): ALSA: line6: Use correct endpoint type for midi output Federico Cuello (1): ALSA: usb: mixer: volume quirk for CM102-A+/102S+ Filipe Manana (3): Btrfs: fix copy_items() return value when logging an inode Btrfs: ensure tmpfile inode is always persisted with link count of 0 Btrfs: don't leave dangling dentry if symlink creation failed Florent Flament (1): drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log Florian Fainelli (2): net: bcmgenet: Fix sparse warnings in bcmgenet_put_tx_csum() net: systemport: Fix sparse warnings in bcm_sysport_insert_tsb() Florian Westphal (1): netfilter: nf_tables: can't fail after linking rule into active rule list Francisco Jerez (1): drm/i915: Fix command parser to validate multiple register access with the same command. Geert Uytterhoeven (6): serial: arc_uart: Fix out-of-bounds access through DT alias serial: fsl_lpuart: Fix out-of-bounds access through DT alias serial: imx: Fix out-of-bounds access through serial port index serial: mxs-auart: Fix out-of-bounds access through serial port index serial: pxa: Fix out-of-bounds access through serial port index serial: xuartps: Fix out-of-bounds access through DT alias Govindarajulu Varadarajan (1): enic: set DMA mask to 47 bit Greg Kroah-Hartman (1): USB: serial: visor: handle potential invalid device configuration Guenter Roeck (4): hwmon: (pmbus/max8688) Accept negative page register values hwmon: (pmbus/adm1275) Accept negative page register values hwmon: (nct6775) Fix writing pwmX_mode hwmon: (nct6683) Enable EC access if disabled at boot Guillaume Nault (12): l2tp: fix races in tunnel creation l2tp: fix race in duplicate tunnel detection l2tp: hold reference on tunnels in netlink dumps l2tp: hold reference on tunnels printed in pppol2tp proc file l2tp: hold reference on tunnels printed in l2tp/tunnels debugfs file l2tp: fix {pppol2tp, l2tp_dfs}_seq_stop() in case of seq_file overflow l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() ppp: fix device unregistration upon netns deletion ppp: fix lockdep splat in ppp_dev_uninit() ppp: fix race in ppp device destruction ppp: unlock all_ppp_mutex before registering device Gustavo A. R. Silva (3): atm: zatm: Fix potential Spectre v1 net: atm: Fix potential Spectre v1 kernel/sys.c: fix potential Spectre v1 issue Hans de Goede (1): libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs Heinrich Schuchardt (1): usb: musb: gadget: misplaced out of bounds check Helge Deller (2): parisc: Fix HPMC handler by increasing size to multiple of 16 bytes parisc: Fix out of array access in match_pci_device() Hendrik Brueckner (1): s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero Herbert Xu (1): crypto: ahash - Fix early termination in hash walk Huacai Chen (1): zboot: fix stack protector in compressed boot phase Ian Kent (1): autofs: mount point create should honour passed in mode Igor Pylypiv (1): watchdog: f71808e_wdt: Fix WD_EN register read Ilya Dryomov (1): libceph: validate con->state at the top of try_write() Ivan Khoronzhuk (1): net: ethernet: ti: cpdma: correct error handling for chan create Jack Morgenstein (1): net/mlx4: Fix irq-unsafe spinlock usage Jaegeuk Kim (2): f2fs: call f2fs_unlock_op after error was handled f2fs: go out for insert_inode_locked failure James Kelly (1): ASoC: ssm2602: Replace reg_default_raw with reg_default Jan Kara (3): bdi: Fix oops in wb_workfn() ufs: Fix warning from unlock_new_inode() ufs: Fix possible deadlock when looking up directories Jann Horn (1): tcp: don't read out-of-bounds opsize Jason Andryuk (1): HID: i2c-hid: Fix "incomplete report" noise Jeff Moyer (1): block_invalidatepage(): only release page if the full page was invalidated Jens Remus (1): scsi: zfcp: fix infinite iteration on ERP ready list Jerome Brunet (1): clk: fix mux clock documentation Jimmy Assarsson (1): can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg() Jiri Olsa (1): perf record: Put new line after target override warning Joakim Tjernlund (3): mtd: cfi: cmdset_0001: Do not allow read/write to suspend erase block. mtd: cfi: cmdset_0001: Workaround Micron Erase suspend bug. mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block. Joe Jin (1): xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent Joerg Roedel (1): x86/mm: Prevent kernel Oops in PTDUMP code with HIGHPTE=y Johan Hovold (2): USB: serial: cp210x: add ELDAT Easywave RX09 id rfkill: gpio: fix memory leak in probe error path Jonathan Neuschäfer (1): net: core: dst: Add kernel-doc for 'net' parameter Julian Anastasov (3): ipv4: fix fnhe usage by non-cached routes ipvs: fix stats update from local clients ipvs: fix buffer overflow with sync daemon and service Julian Wiedmann (5): s390/qdio: don't merge ERROR output buffers s390/qdio: don't retry EQBS after CCQ 96 s390/qeth: handle failure on workqueue creation s390/qdio: fix access to uninitialized qdio_q fields s390/qdio: don't release memory in qdio_setup_irq() Kai-Heng Feng (2): sky2: Increase D3 delay to sky2 stops working after suspend xhci: Fix USB ports for Dell Inspiron 5775 Kamil Lulko (1): usb: core: Add quirk for HP v222w 16GB Mini Kenny Yu (1): uprobe: Find last occurrence of ':' when parsing uprobe PATH:OFFSET Kirill A. Shutemov (1): ipc/shm: handle removed segments gracefully in shm_mmap() Krzysztof Mazur (1): um: Use POSIX ucontext_t instead of struct ucontext Kyle Roeschley (1): USB: serial: cp210x: add ID for NI USB serial console Lance Richardson (1): net: support compat 64-bit time in {s,g}etsockopt Leon Romanovsky (1): RDMA/mlx5: Protect from shift operand overflow Leonard Crestez (1): crypto: arm,arm64 - Fix random regeneration of S_shipped Li RongQing (1): x86/apic: Fix signedness bug in APIC ID validity checks Linus Lüssing (1): batman-adv: Fix TT sync flags for intermediate TT responses Linus Torvalds (3): mmap: introduce sane default mmap limits mmap: relax file size limit for regular files give up on gcc ilog2() constant optimizations Liu Bo (3): Btrfs: fix unexpected cow in run_delalloc_nocow Btrfs: fix NULL pointer dereference in log_dir_items Btrfs: bail out on error during replay_dir_deletes Long Li (1): cifs: Allocate validate negotiation request through kmalloc Maciej W. Rozycki (3): MIPS: ptrace: Expose FIR register through FP regset MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs Mahesh Rajashekhara (1): scsi: sd: Defer spinning up drive while SANITIZE is in progress Major Hayden (1): USB: serial: ftdi_sio: add RT Systems VX-8 cable Marc Dionne (1): afs: Ignore AFS_ACE_READ and AFS_ACE_WRITE for directories Marc Zyngier (1): KVM: arm/arm64: Close VMID generation race Marek Lindner (1): batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs Mark Brown (1): regmap: Support bulk reads for devices without raw formatting Markus Elfring (2): video/fbdev/stifb: Return -ENOMEM after a failed kzalloc() in stifb_init_fb() tracing: Deletion of an unnecessary check before iput() Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Martin Kelly (2): iio:buffer: make length types match kfifo types iio:kfifo_buf: check for uint overflow Masami Hiramatsu (3): tracing/uprobe_event: Fix strncpy corner case ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions Mathieu Desnoyers (1): tracepoint: Do not warn on ENOMEM Matt Redfearn (4): MIPS: memset.S: EVA & fault support for small_memset MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup MIPS: memset.S: Fix clobber of v1 in last_fixup MIPS: uaccess: Add micromips clobbers to bzero invocation Matthew Auld (1): drm/i915/userptr: reject zero user_size Matthew Wilcox (1): mm/filemap.c: fix NULL pointer in page_cache_tree_insert() Mauro Carvalho Chehab (1): media: v4l2-compat-ioctl32: don't oops on overlay Michael Ellerman (1): powerpc/lib: Fix off-by-one in alternate feature patching Michael Neuling (3): powerpc/eeh: Fix race with driver un/bind powerpc/eeh: Fix enabling bridge MMIO windows powerpc/64s: Clear PCR on boot Michael S. Tsirkin (6): virtio_console: don't tie bufs to a vq virtio: add ability to iterate over vqs virtio_console: free buffers after reset virtio_console: drop custom control queue cleanup virtio_console: move removal code virtio_console: reset on out of memory Michal Srb (1): drm/i915/cmdparser: Do not check past the cmd length. Mika Westerberg (2): ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status() ahci: Add PCI ID for Cannon Lake PCH-LP AHCI Mike Frysinger (1): vt: change SGR 21 to follow the standards Mike Galbraith (1): sched/autogroup: Fix 64-bit kernel nice level adjustment Mike Kravetz (1): hugetlbfs: fix bug in pgoff overflow checking Mikhail Lappo (1): thermal: imx: Fix race condition in imx_thermal_probe() Moshe Shemesh (1): net/mlx4_en: Verify coalescing parameters are in range Nicholas Piggin (5): powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write() powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops powerpc/powernv: Fix NVRAM sleep in invalid context when crashing Nico Sneck (1): drm/radeon: add PX quirk for Asus K73TK Nicolas Dichtel (1): ip_tunnel: restore binding to ifaces with a large mtu Nicolas Ferre (1): ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property Nicolin Chen (1): ASoC: fsl_esai: Fix divisor calculation failure at lower ratio Nikolay Borisov (3): btrfs: Refactor transaction handling in received subvolume ioctl btrfs: Handle error from btrfs_uuid_tree_rem call in _btrfs_ioctl_set_received_subvol btrfs: Fix possible softlock on single core machines Ondrej Zary (2): Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad drm/i915: Disable LVDS on Radiant P845 Paolo Abeni (2): team: avoid adding twice the same option to the event list netfilter: ebtables: handle string from userspace with care Paul Parsons (1): drm/radeon: Fix PCIe lane width calculation Peng Hao (1): kvm: x86: fix a compile warning Peter Rosin (3): i2c: pmcmsp: return message count on master_xfer success i2c: pmcmsp: fix error return from master_xfer i2c: viperboard: return message count on master_xfer success Peter Zijlstra (5): clocksource: Initialize cs->wd_list sched/core: Fix possible Spectre-v1 indexing for sched_prio_to_weight[] sched/autogroup: Fix possible Spectre-v1 indexing for sched_prio_to_weight[] perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map() perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_* Prakash Kamliya (1): drm/msm: fix leak in failed get_pages Qu Wenruo (1): btrfs: tests/qgroup: Fix wrong tree backref level Raju Rangoju (1): RDMA/cxgb4: release hw resources on device removal Rasmus Villemoes (2): drivers: tty: Merge alloc_tty_struct and initialize_tty_struct drivers: tty: Fix use-after-free in pty_common_install Ravi Chandra Sadineni (1): USB: Increment wakeup count on remote wakeup. Richard Weinberger (2): ubifs: Check ubifs_wbuf_sync() return code ubi: Reject MLC NAND Robbie Ko (1): Btrfs: send, fix invalid access to commit roots due to concurrent snapshotting Rodrigo Rivas Costa (1): HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device Roland Dreier (3): RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device RDMA/ucma: Introduce safer rdma_addr_size() variants RDMA/ucma: Allow resolving address w/o specifying source address Romain Izard (1): ubi: Fix error for write access Ronnie Sahlberg (1): cifs: fix memory leak in SMB2_open() Russell King (1): ARM: keystone: fix platform_domain_notifier array overrun SZ Lin (林上智) (1): NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2 Sachin Grover (1): selinux: KASAN: slab-out-of-bounds in xattr_getsecurity Sean Young (1): media: rc: oops in ir_timer_keyup after device unplug Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Sekhar Nori (1): ARM: davinci: board-dm646x-evm: set VPIF capture card name Sergei Shtylyov (1): drm: rcar-du: lvds: Fix LVDS startup on R-Car Gen2 Shamir Rabinovitch (1): RDMA/ucma: ucma_context reference leak in error path Shuah Khan (2): usbip: vhci_hcd: check rhport before using in vhci_hub_control() usbip: vhci_hcd: Fix usb device and sockfd leaks Song Liu (1): tracing: Fix bad use of igrab in trace_uprobe.c Stefan Brüns (1): drm/i915: Try EDID bitbanging on HDMI after failed read Stefan Haberland (1): s390/dasd: fix IO error for newly defined devices Steve French (2): cifs: do not allow creating sockets except with SMB1 posix exensions smb3: directory sync should not return an error Steven Rostedt (VMware) (3): tracing: Fix regex_match_front() to not over compare the test string tracing/x86/xen: Remove zero data size trace events trace_xen_mmu_flush_tlb{_all} tracing: Fix crash when freeing instances with event triggers Sudhir Sreedharan (1): rtl8187: Fix NULL pointer dereference in priv->conf_mutex Sudip Mukherjee (1): libata: blacklist Micron 500IT SSD with MU01 firmware Sven Eckelmann (1): batman-adv: Avoid race in TT TVLV allocator helper Takashi Iwai (21): ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation ALSA: pcm: Avoid potential races between OSS ioctls and read/write ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls ALSA: pcm: Fix UAF at PCM release via PCM timer access ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation resource: fix integer overflow at reallocation ALSA: rawmidi: Fix missing input substream checks in compat ioctls ALSA: usb-audio: Skip broken EU on Dell dock USB-audio ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device ALSA: seq: oss: Hardening for potential Spectre v1 ALSA: control: Hardening for potential Spectre v1 ALSA: hda: Hardening for potential Spectre v1 ALSA: opl3: Hardening for potential Spectre v1 ALSA: asihpi: Hardening for potential Spectre v1 ALSA: hdspm: Hardening for potential Spectre v1 ALSA: rme9652: Hardening for potential Spectre v1 ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger() ALSA: aloop: Add missing cable lock to ctl API callbacks ALSA: pcm: Check PCM state at xfern compat ioctl ALSA: timer: Call notifier in the same spinlock Tarick Bedeir (1): net/mlx4_core: Fix error handling in mlx4_init_port_info. Tejun Heo (1): libata: Blacklist some Sandisk SSDs for NCQ Tetsuo Handa (4): tty: Avoid possible error pointer dereference at tty_ldisc_restore(). tty: Don't call panic() at tty_ldisc_init() tty: Use __GFP_NOFAIL for tty_ldisc_get() x86/kexec: Avoid double free_page() upon do_kexec_load() failure Theodore Ts'o (6): jbd2: if the journal is aborted then don't allow update of the log tail ext4: don't update checksum of new initialized bitmaps ext4: add bounds checking to ext4_xattr_find_entry() ext4: add extra checks to ext4_xattr_block_get() ext4: force revalidation of directory pointer after seekdir(2) ext4: set h_journal if there is a failure starting a reserved handle Thinh Nguyen (1): usb: dwc3: pci: Properly cleanup resource Tony Lindgren (1): net: davinci_emac: Fix runtime pm calls for davinci_emac Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Uwe Kleine-König (1): serial: altera: ensure port->regshift is honored consistently Vasily Gorbik (1): s390/ipl: ensure loadparm valid flag is set Vasyl Vavrychuk (1): USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster Wei Huang (1): KVM: x86: Update cpuid properly when CR4.OSXAVE or CR4.PKE is changed Wenwen Wang (1): ALSA: control: fix a redundant-copy issue Willem de Bruijn (2): packet: fix bitfield update race net: test tailroom before appending to linear skb Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xiaoming Gao (1): x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Xin Long (5): sctp: do not check port in sctp_inet6_cmp_addr bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team sctp: handle two v4 addrs comparison in sctp_inet6_cmp_addr sctp: fix the issue that the cookie-ack with auth can't get processed Yan, Zheng (1): ceph: always update atime/mtime/ctime for new inode Yazen Ghannam (1): x86/smpboot: Don't use mwait_play_dead() on AMD systems Yishai Hadas (1): RDMA/mlx5: Don't assume that medium blueFlame register exists Zhengjun Xing (1): USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw himanshu.madhani(a)cavium.com (1): scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS hpreg(a)vmware.com (1): vmxnet3: set the DMA mask before the first DMA map operation piaojun (1): ocfs2/dlm: wait for dlm recovery done when migrating all lock resources Łukasz Stelmach (1): ARM: 8753/1: decompressor: add a missing parameter to the addruart macro

7 years

1
0
0 0

[PATCH v4] selinux: policydb - fix byte order and alignment issues

by Ondrej Mosnacek

Do the LE conversions before doing the Infiniband-related range checks. The incorrect checks are otherwise causing a failure to load any policy with an ibendportcon rule on BE systems. This can be reproduced by running (on e.g. ppc64): cat >my_module.cil <<EOF (type test_ibendport_t) (roletype object_r test_ibendport_t) (ibendportcon mlx4_0 1 (system_u object_r test_ibendport_t ((s0) (s0)))) EOF semodule -i my_module.cil Also, fix loading/storing the 64-bit subnet prefix for OCON_IBPKEY to use a correctly aligned buffer. Finally, do not use the 'nodebuf' (u32) buffer where 'buf' (__le32) should be used instead. Tested internally on a ppc64 machine with a RHEL 7 kernel with this patch applied. Cc: Daniel Jurgens <danielj(a)mellanox.com> Cc: Eli Cohen <eli(a)mellanox.com> Cc: James Morris <jmorris(a)namei.org> Cc: Doug Ledford <dledford(a)redhat.com> Cc: <stable(a)vger.kernel.org> # 4.13+ Fixes: a806f7a1616f ("selinux: Create policydb version for Infiniband support") Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- security/selinux/ss/policydb.c | 46 +++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-) Changes in v4: - defer assignment to 16-bit struct fields to after the range check Changes in v3: - use separate buffer for the 64-bit subnet_prefix - add comments on the byte ordering of subnet_prefix - deduplicate the le32_to_cpu() calls from checks Changes in v2: - add reproducer to commit message - update e-mail address of James Morris - better Cc also the old SELinux ML diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index f4eadd3f7350..d50668006a52 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -2108,6 +2108,7 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, { int i, j, rc; u32 nel, len; + __be64 prefixbuf[1]; __le32 buf[3]; struct ocontext *l, *c; u32 nodebuf[8]; @@ -2217,21 +2218,30 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, goto out; break; } - case OCON_IBPKEY: - rc = next_entry(nodebuf, fp, sizeof(u32) * 4); + case OCON_IBPKEY: { + u32 pkey_lo, pkey_hi; + + rc = next_entry(prefixbuf, fp, sizeof(u64)); + if (rc) + goto out; + + /* we need to have subnet_prefix in CPU order */ + c->u.ibpkey.subnet_prefix = be64_to_cpu(prefixbuf[0]); + + rc = next_entry(buf, fp, sizeof(u32) * 2); if (rc) goto out; - c->u.ibpkey.subnet_prefix = be64_to_cpu(*((__be64 *)nodebuf)); + pkey_lo = le32_to_cpu(buf[0]); + pkey_hi = le32_to_cpu(buf[1]); - if (nodebuf[2] > 0xffff || - nodebuf[3] > 0xffff) { + if (pkey_lo > U16_MAX || pkey_hi > U16_MAX) { rc = -EINVAL; goto out; } - c->u.ibpkey.low_pkey = le32_to_cpu(nodebuf[2]); - c->u.ibpkey.high_pkey = le32_to_cpu(nodebuf[3]); + c->u.ibpkey.low_pkey = pkey_lo; + c->u.ibpkey.high_pkey = pkey_hi; rc = context_read_and_validate(&c->context[0], p, @@ -2239,6 +2249,7 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, if (rc) goto out; break; + } case OCON_IBENDPORT: rc = next_entry(buf, fp, sizeof(u32) * 2); if (rc) @@ -2249,13 +2260,14 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, if (rc) goto out; - if (buf[1] > 0xff || buf[1] == 0) { + c->u.ibendport.port = le32_to_cpu(buf[1]); + + if (c->u.ibendport.port > 0xff || + c->u.ibendport.port == 0) { rc = -EINVAL; goto out; } - c->u.ibendport.port = le32_to_cpu(buf[1]); - rc = context_read_and_validate(&c->context[0], p, fp); @@ -3105,6 +3117,7 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, { unsigned int i, j, rc; size_t nel, len; + __be64 prefixbuf[1]; __le32 buf[3]; u32 nodebuf[8]; struct ocontext *c; @@ -3192,12 +3205,17 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, return rc; break; case OCON_IBPKEY: - *((__be64 *)nodebuf) = cpu_to_be64(c->u.ibpkey.subnet_prefix); + /* subnet_prefix is in CPU order */ + prefixbuf[0] = cpu_to_be64(c->u.ibpkey.subnet_prefix); - nodebuf[2] = cpu_to_le32(c->u.ibpkey.low_pkey); - nodebuf[3] = cpu_to_le32(c->u.ibpkey.high_pkey); + rc = put_entry(prefixbuf, sizeof(u64), 1, fp); + if (rc) + return rc; - rc = put_entry(nodebuf, sizeof(u32), 4, fp); + buf[0] = cpu_to_le32(c->u.ibpkey.low_pkey); + buf[1] = cpu_to_le32(c->u.ibpkey.high_pkey); + + rc = put_entry(buf, sizeof(u32), 2, fp); if (rc) return rc; rc = context_write(p, &c->context[0], fp); -- 2.17.2

7 years

3
5
0 0

[PATCH] PCI / PM: Allow runtime PM without callback functions

by Jarkko Nikula

Allow PCI core to do runtime PM to devices without needing to use dummy runtime PM callback functions if there is no need to do anything device specific beyond PCI device power state management. Implement this by letting core to change device power state during runtime PM transitions even if no callback functions are defined. Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") Reported-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- This is related to my i2c-i801.c fix thread back in June which I completely forgot till now: https://lkml.org/lkml/2018/6/27/642 Discussion back then was that it should be handled in the PCI PM instead of having dummy functions in the drivers. I wanted to respin with a patch. --- drivers/pci/pci-driver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index bef17c3fca67..6185b878ede1 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1239,7 +1239,7 @@ static int pci_pm_runtime_suspend(struct device *dev) struct pci_dev *pci_dev = to_pci_dev(dev); const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; pci_power_t prev = pci_dev->current_state; - int error; + int error = 0; /* * If pci_dev->driver is not set (unbound), we leave the device in D0, @@ -1251,11 +1251,9 @@ static int pci_pm_runtime_suspend(struct device *dev) return 0; } - if (!pm || !pm->runtime_suspend) - return -ENOSYS; - pci_dev->state_saved = false; - error = pm->runtime_suspend(dev); + if (pm && pm->runtime_suspend) + error = pm->runtime_suspend(dev); if (error) { /* * -EBUSY and -EAGAIN is used to request the runtime PM core @@ -1292,7 +1290,7 @@ static int pci_pm_runtime_suspend(struct device *dev) static int pci_pm_runtime_resume(struct device *dev) { - int rc; + int rc = 0; struct pci_dev *pci_dev = to_pci_dev(dev); const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; @@ -1306,14 +1304,12 @@ static int pci_pm_runtime_resume(struct device *dev) if (!pci_dev->driver) return 0; - if (!pm || !pm->runtime_resume) - return -ENOSYS; - pci_fixup_device(pci_fixup_resume_early, pci_dev); pci_enable_wake(pci_dev, PCI_D0, false); pci_fixup_device(pci_fixup_resume, pci_dev); - rc = pm->runtime_resume(dev); + if (pm && pm->runtime_resume) + rc = pm->runtime_resume(dev); pci_dev->runtime_d3cold = false; -- 2.19.1

7 years

4
7
0 0

[tip:perf/core] kprobes/x86: Use preempt_enable() in optimized_callback()

by tip-bot for Masami Hiramatsu

Commit-ID: 2e62024c265aa69315ed02835623740030435380 Gitweb: https://git.kernel.org/tip/2e62024c265aa69315ed02835623740030435380 Author: Masami Hiramatsu <mhiramat(a)kernel.org> AuthorDate: Sat, 20 Oct 2018 18:47:53 +0900 Committer: Ingo Molnar <mingo(a)kernel.org> CommitDate: Mon, 22 Oct 2018 03:31:01 +0200 kprobes/x86: Use preempt_enable() in optimized_callback() The following commit: a19b2e3d7839 ("kprobes/x86: Remove IRQ disabling from ftrace-based/optimized kprobes”) removed local_irq_save/restore() from optimized_callback(), the handler might be interrupted by the rescheduling interrupt and might be rescheduled - so we must not use the preempt_enable_no_resched() macro. Use preempt_enable() instead, to not lose preemption events. [ mingo: Improved the changelog. ] Reported-by: Nadav Amit <namit(a)vmware.com> Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Cc: <stable(a)vger.kernel.org> Cc: Alexei Starovoitov <alexei.starovoitov(a)gmail.com> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Oleg Nesterov <oleg(a)redhat.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: dwmw(a)amazon.co.uk Fixes: a19b2e3d7839 ("kprobes/x86: Remove IRQ disabling from ftrace-based/optimized kprobes”) Link: http://lkml.kernel.org/r/154002887331.7627.10194920925792947001.stgit@devbox Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- arch/x86/kernel/kprobes/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index eaf02f2e7300..40b16b270656 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -179,7 +179,7 @@ optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs) opt_pre_handler(&op->kp, regs); __this_cpu_write(current_kprobe, NULL); } - preempt_enable_no_resched(); + preempt_enable(); } NOKPROBE_SYMBOL(optimized_callback);

7 years

1
0
0 0

[PATCH v2] f2fs: fix to account IO correctly

by Chao Yu

Below race can cause reversed reference on dirty count, fix it by relocating __submit_bio() and inc_page_count(). Thread A Thread B - f2fs_inplace_write_data - f2fs_submit_page_bio - __submit_bio - f2fs_write_end_io - dec_page_count - inc_page_count Cc: <stable(a)vger.kernel.org> Fixes: d1b3e72d5490 ("f2fs: submit bio of in-place-update pages") Signed-off-by: Chao Yu <yuchao0(a)huawei.com> --- v2: - split into two parts, fix previous bug in this part, merge another part into other related patch. fs/f2fs/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 9ef6f1f01eda..83b1983094bd 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -462,10 +462,10 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) } bio_set_op_attrs(bio, fio->op, fio->op_flags); - __submit_bio(fio->sbi, bio, fio->type); - if (!is_read_io(fio->op)) inc_page_count(fio->sbi, WB_DATA_TYPE(fio->page)); + + __submit_bio(fio->sbi, bio, fio->type); return 0; } -- 2.18.0.rc1

7 years

1
0
0 0

[PATCH 2/2] selftests/ftrace: Fix synthetic event test to delete event correctly

by Masami Hiramatsu

Fix the synthetic event test case to remove event correctly. If redirecting command to synthetic_event file without append mode, it cleans up all existing events and execute (parse) the command. This means "delete event" always fails to find the target event. Since previous synthetic event has a bug which doesn't return -ENOENT even if it fails to find the deleting event, this test passed. But fixing that bug, this test fails because this test itself has a bug. This fixes that bug by trying to delete event right after adding an event, and use append mode redirection ('>>') instead of normal redirection ('>'). Fixes: f06eec4d0f2c ('selftests: ftrace: Add inter-event hist triggers testcases') Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: stable(a)vger.kernel.org Cc: Rajvi Jingar <rajvi.jingar(a)intel.com> Cc: Tom Zanussi <tom.zanussi(a)linux.intel.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Steven Rostedt (VMware) <rostedt(a)goodmis.org> --- .../trigger-synthetic-event-createremove.tc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc index cef11377dcbd..c604438df13b 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc @@ -35,18 +35,18 @@ fi reset_trigger -echo "Test create synthetic event with an error" -echo 'wakeup_latency u64 lat pid_t pid char' > synthetic_events > /dev/null +echo "Test remove synthetic event" +echo '!wakeup_latency u64 lat pid_t pid char comm[16]' >> synthetic_events if [ -d events/synthetic/wakeup_latency ]; then - fail "Created wakeup_latency synthetic event with an invalid format" + fail "Failed to delete wakeup_latency synthetic event" fi reset_trigger -echo "Test remove synthetic event" -echo '!wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events +echo "Test create synthetic event with an error" +echo 'wakeup_latency u64 lat pid_t pid char' > synthetic_events > /dev/null if [ -d events/synthetic/wakeup_latency ]; then - fail "Failed to delete wakeup_latency synthetic event" + fail "Created wakeup_latency synthetic event with an invalid format" fi do_reset

7 years

1
0
0 0

[PATCH 1/2] tracing: Return -ENOENT if there is no target synthetic event

by Masami Hiramatsu

Return -ENOENT error if there is no target synthetic event. This notices an operation failure to user as below; # echo 'wakeup_latency u64 lat; pid_t pid;' > synthetic_events # echo '!wakeup' >> synthetic_events sh: write error: No such file or directory Fixes: 4b147936fa50 ('tracing: Add support for 'synthetic' events') Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: stable(a)vger.kernel.org Cc: Tom Zanussi <tom.zanussi(a)linux.intel.com> Cc: Steven Rostedt <rostedt(a)goodmis.org> --- kernel/trace/trace_events_hist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index d239004aaf29..eb908ef2ecec 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1063,8 +1063,10 @@ static int create_synth_event(int argc, char **argv) event = NULL; ret = -EEXIST; goto out; - } else if (delete_event) + } else if (delete_event) { + ret = -ENOENT; goto out; + } if (argc < 2) { ret = -EINVAL;

7 years

1
0
0 0

4.14: Regression on ppc32 (early crash)

by Christoph Biedl

Hello, on both my ppc32 systems I've tested (G4 PowerMac and G4 Mac-mini), I see a regression after upgrading from 4.14.74 to 4.14.76: Very soon after starting the kernel from yaboot, they drop me into a OF prompt, message is "invalid memory access at" on the mini, and another one I forgot on the PowerMac. FWIW, the ppc64 G5 PowerMac does fine. Before I start bisecting - might take a few days -, is this already on radar? Christoph

7 years

2
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror