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

FAILED: patch "[PATCH] power: supply: twl4030-charger: fix OF sibling-node lookup" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9844fb2e351311210e6660a9a1c62d17424a6145 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan(a)kernel.org> Date: Mon, 27 Aug 2018 10:21:53 +0200 Subject: [PATCH] power: supply: twl4030-charger: fix OF sibling-node lookup Use the new of_get_compatible_child() helper to lookup the usb sibling node instead of using of_find_compatible_node(), which searches the entire tree from a given start node and thus can return an unrelated (non-sibling) node. This also addresses a potential use-after-free (e.g. after probe deferral) as the tree-wide helper drops a reference to its first argument (i.e. the parent device node). While at it, also fix the related phy-node reference leak. Fixes: f5e4edb8c888 ("power: twl4030_charger: find associated phy by more reliable means.") Cc: stable <stable(a)vger.kernel.org> # 4.2 Cc: NeilBrown <neilb(a)suse.de> Cc: Felipe Balbi <felipe.balbi(a)linux.intel.com> Cc: Sebastian Reichel <sre(a)kernel.org> Reviewed-by: Sebastian Reichel <sre(a)kernel.org> Signed-off-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Rob Herring <robh(a)kernel.org> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index bbcaee56db9d..b6a7d9f74cf3 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -996,12 +996,13 @@ static int twl4030_bci_probe(struct platform_device *pdev) if (bci->dev->of_node) { struct device_node *phynode; - phynode = of_find_compatible_node(bci->dev->of_node->parent, - NULL, "ti,twl4030-usb"); + phynode = of_get_compatible_child(bci->dev->of_node->parent, + "ti,twl4030-usb"); if (phynode) { bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; bci->transceiver = devm_usb_get_phy_by_node( bci->dev, phynode, &bci->usb_nb); + of_node_put(phynode); if (IS_ERR(bci->transceiver)) { ret = PTR_ERR(bci->transceiver); if (ret == -EPROBE_DEFER)

6 years, 10 months

2
1
0 0

[PATCH 4.19 000/118] 4.19.5-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.5 release. There are 118 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Nov 28 10:50:22 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.5-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.5-rc1 Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> mt76x0: run vco calibration for each channel configuration Ilya Dryomov <idryomov(a)gmail.com> libceph: fall back to sendmsg for slab pages Sebastian Parschauer <sparschauer(a)suse.de> HID: Add quirk for Microsoft PIXART OEM mouse Sebastian Parschauer <sparschauer(a)suse.de> HID: Add quirk for Primax PIXART OEM mice Eric Biggers <ebiggers(a)google.com> HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges Hans de Goede <hdegoede(a)redhat.com> ACPI / platform: Add SMB0001 HID to forbidden_id_list Gustavo A. R. Silva <gustavo(a)embeddedor.com> drivers/misc/sgi-gru: fix Spectre v1 vulnerability Johan Hovold <johan(a)kernel.org> mtd: rawnand: atmel: fix OF child-node lookup Johan Hovold <johan(a)kernel.org> gnss: sirf: fix synchronous write timeout Johan Hovold <johan(a)kernel.org> gnss: serial: fix synchronous write timeout Mattias Jacobsson <2pi(a)mok.nu> USB: misc: appledisplay: add 20" Apple Cinema Display Nathan Chancellor <natechancellor(a)gmail.com> misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data Emmanuel Pescosta <emmanuelpescosta099(a)gmail.com> usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: Wait for extra delay time after USB_PORT_FEAT_RESET for quirky hub Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: quirks: Add no-lpm quirk for Raydium touchscreens Maarten Jacobs <maarten256(a)outlook.com> usb: cdc-acm: add entry for Hiro (Conexant) modem Jimmy Assarsson <jimmyassarsson(a)gmail.com> can: kvaser_usb: Fix potential uninitialized variable use Jimmy Assarsson <jimmyassarsson(a)gmail.com> can: kvaser_usb: Fix accessing freed memory in kvaser_usb_start_xmit() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek - Add quirk entry for HP Pavilion 15 Dan Carpenter <dan.carpenter(a)oracle.com> uio: Fix an Oops on load Olof Johansson <olof(a)lixom.net> RISC-V: Fix raw_copy_{to,from}_user() Aaro Koskinen <aaro.koskinen(a)iki.fi> MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver Sakari Ailus <sakari.ailus(a)linux.intel.com> media: v4l: event: Add subscription to list before calling "add" operation Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/ldt: Remove unused variable in map_ldt_struct() Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/ldt: Unmap PTEs for the slot before freeing LDT pages Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/mm: Move LDT remap out of KASLR region on 5-level paging YueHaibing <yuehaibing(a)huawei.com> SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer() Guenter Roeck <linux(a)roeck-us.net> Revert "scripts/setlocalversion: git: Make -dirty check more robust" Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: deb-pkg: fix too low build version number Dmitry Bogdanov <dmitry.bogdanov(a)aquantia.com> net: aquantia: invalid checksumm offload implementation Igor Russkikh <Igor.Russkikh(a)aquantia.com> net: aquantia: fixed enable unicast on 32 macvlan Dmitry Bogdanov <dmitry.bogdanov(a)aquantia.com> net: aquantia: fix potential IOMMU fault after driver unbind Thor Thayer <thor.thayer(a)linux.intel.com> net: stmmac: Fix RX packet size > 8191 Sagiv Ozeri <sagiv.ozeri(a)cavium.com> qed: Fix potential memory corruption Denis Bolotin <denis.bolotin(a)cavium.com> qed: Fix SPQ entries not returned to pool in error flows Denis Bolotin <denis.bolotin(a)cavium.com> qed: Fix blocking/unlimited SPQ entries leak Denis Bolotin <denis.bolotin(a)cavium.com> qed: Fix memory/entry leak in qed_init_sp_request() Jacob Keller <jacob.e.keller(a)intel.com> i40e: restore NETIF_F_GSO_IPXIP[46] to netdev features Chinh T Cao <chinh.t.cao(a)intel.com> ice: Change req_speeds to be u16 Brett Creeley <brett.creeley(a)intel.com> ice: Fix the bytecount sent to netdev_tx_sent_queue Akeem G Abodunrin <akeem.g.abodunrin(a)intel.com> ice: Fix dead device link issue with flow control Jiri Olsa <jolsa(a)kernel.org> perf tools: Do not zero sample_id_all for group members Gustavo Romero <gromero(a)linux.vnet.ibm.com> perf tools: Fix undefined symbol scnprintf in libperf-jvmti.so Valentin Schneider <valentin.schneider(a)arm.com> sched/core: Take the hotplug lock in sched_init_smp() Stephen Boyd <swboyd(a)chromium.org> i2c: qcom-geni: Fix runtime PM mismatch with child devices Vignesh R <vigneshr(a)ti.com> i2c: omap: Enable for ARCH_K3 Sagi Grimberg <sagi(a)grimberg.me> nvme: make sure ns head inherits underlying device limits Robin Murphy <robin.murphy(a)arm.com> of/device: Really only set bus DMA mask when appropriate Luis Henriques <lhenriques(a)suse.com> ceph: quota: fix null pointer dereference in quota check Thomas Richter <tmricht(a)linux.ibm.com> s390/perf: Change CPUM_CF return code in event init function Lyude Paul <lyude(a)redhat.com> drm/amd/amdgpu/dm: Fix dm_dp_create_fake_mst_encoder() Jerry (Fangzhi) Zuo <Jerry.Zuo(a)amd.com> drm/amd/display: Drop reusing drm connector for MST Keith Busch <keith.busch(a)intel.com> block: Clear kernel memory before copying to user Harry Wentland <harry.wentland(a)amd.com> drm/amd/display: Stop leaking planes Jeremy Linton <jeremy.linton(a)arm.com> lib/raid6: Fix arm64 test build Boris Brezillon <boris.brezillon(a)bootlin.com> mtd: nand: Fix nanddev_pos_next_page() kernel-doc header Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> clk: fixed-factor: fix of_node_get-put imbalance Liam Merwick <Liam.Merwick(a)oracle.com> xen/grant-table: Fix incorrect gnttab_dma_free_pages() pr_debug message Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> arm64: dts: renesas: condor: switch from EtherAVB to GEther Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> arm64: dts: renesas: r8a7795: add missing dma-names on hscif2 Inki Dae <inki.dae(a)samsung.com> Revert "drm/exynos/decon5433: implement frame counter" Rob Herring <robh(a)kernel.org> ARM: dts: fsl: Fix improperly quoted stdout-path values Oleksij Rempel <o.rempel(a)pengutronix.de> ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node Geert Uytterhoeven <geert(a)linux-m68k.org> hwmon: (ibmpowernv) Remove bogus __init annotations Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: Fix for out-of-bounds access when setting pfc back pressure Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: unregister netdevice only when registered Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix HiperSockets sniffer Florian Westphal <fw(a)strlen.de> netfilter: nft_compat: ebtables 'nat' table is normal chain type Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> netfilter: ipset: Fix calling ip_set() macro at dumping Taehee Yoo <ap420073(a)gmail.com> netfilter: xt_IDLETIMER: add sysfs filename checking routine Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment() Daniel Borkmann <daniel(a)iogearbox.net> bpf: fix bpf_prog_get_info_by_fd to return 0 func_lens for unpriv Justin M. Forbes <jforbes(a)fedoraproject.org> s390/mm: Fix ERROR: "__node_distance" undefined! Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/mm: fix mis-accounting of pgtable_bytes Andrey Ryabinin <aryabinin(a)virtuozzo.com> netfilter: ipset: fix ip_set_list allocation failure Eric Westbrook <eric(a)westbrook.io> netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net Stefano Brivio <sbrivio(a)redhat.com> netfilter: ipset: list:set: Decrease refcount synchronously on deletion and replace Pablo Neira Ayuso <pablo(a)netfilter.org> Revert "netfilter: nft_numgen: add map lookups for numgen random operations" Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: alps: allow incoming reports when only the trackstick is opened Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Revert "HID: add NOGET quirk for Eaton Ellipse MAX UPS" Kai-Heng Feng <kai.heng.feng(a)canonical.com> HID: i2c-hid: Add a small delay after sleep command for Raydium touchpanel Vasily Gorbik <gor(a)linux.ibm.com> s390/vdso: add missing FORCE to build targets Vasily Gorbik <gor(a)linux.ibm.com> s390/decompressor: add missing FORCE to build targets Jiri Slaby <jslaby(a)suse.cz> netfilter: bridge: define INT_MIN & INT_MAX in userspace Florian Westphal <fw(a)strlen.de> netfilter: ipv6: fix oops when defragmenting locally generated fragments Geert Uytterhoeven <geert+renesas(a)glider.be> serial: sh-sci: Fix receive on SCIFA/SCIFB variants with DMA Johan Hovold <johan(a)kernel.org> clk: ti: fix OF child-node lookup Phil Edworthy <phil.edworthy(a)renesas.com> clk: renesas: r9a06g032: Fix UART34567 clock rate Jerome Brunet <jbrunet(a)baylibre.com> clk: meson: clk-pll: drop CLK_GET_RATE_NOCACHE where unnecessary Nathan Chancellor <natechancellor(a)gmail.com> arm64: percpu: Initialize ret in the default case Yixun Lan <yixun.lan(a)amlogic.com> clk: meson-axg: pcie: drop the mpll3 clock parent Paul Gortmaker <paul.gortmaker(a)windriver.com> platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Feng Tang <feng.tang(a)intel.com> x86/earlyprintk: Add a force option for pciserial device Zubin Mithra <zsm(a)chromium.org> apparmor: Fix uninitialized value in aa_split_fqname Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5420: Enable PERIS clocks for suspend Chengguang Xu <cgxu519(a)gmx.com> fs/exofs: fix potential memory leak in mount option parsing David Miller <davem(a)davemloft.net> perf symbols: Set PLT entry/header sizes properly on Sparc Alan Tull <atull(a)kernel.org> clk: fixed-rate: fix of_node_get-put imbalance Rajneesh Bhardwaj <rajneesh.bhardwaj(a)linux.intel.com> platform/x86: intel_telemetry: report debugfs failure David Howells <dhowells(a)redhat.com> afs: Handle EIO from delivery function Lee, Shawn C <shawn.c.lee(a)intel.com> drm/edid: Add 6 bpc quirk for BOE panel. Richard Weinberger <richard(a)nod.at> um: Give start_idle_thread() a return code Milian Wolff <milian.wolff(a)kdab.com> perf unwind: Take pgoff into account when reporting elf to libdwfl Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: prevent btree data loss on root split Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent btree data loss on root split Jann Horn <jannh(a)google.com> reiserfs: propagate errors from fill_with_dentries() properly Radoslaw Tyl <radoslawx.tyl(a)intel.com> ixgbe: fix MAC anti-spoofing filter after VFLR Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for the initialization of command queue's spin lock Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for handling mailbox while the command queue reinitialized Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for rtnl_lock's range in the hclge_reset() Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset() Ming Lei <ming.lei(a)redhat.com> block: brd: associate with queue until adding disk Keith Busch <keith.busch(a)intel.com> nvme-pci: fix conflicting p2p resource adds Anders Roxell <anders.roxell(a)linaro.org> arm64: kprobe: make page to RO mode when allocate it Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix return value for cifs_listxattr Colin Ian King <colin.king(a)canonical.com> cifs: don't dereference smb_file_target before null check Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Replace some PAGE_SIZE with I915_GTT_PAGE_SIZE ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 8 +- Documentation/x86/x86_64/mm.txt | 10 +- Makefile | 4 +- arch/arm/boot/dts/imx53-ppd.dts | 2 +- arch/arm/boot/dts/imx6sll.dtsi | 2 +- arch/arm/boot/dts/vf610m4-colibri.dts | 4 +- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 47 ++++---- arch/arm64/include/asm/percpu.h | 3 + arch/arm64/kernel/probes/kprobes.c | 27 +++-- arch/mips/configs/cavium_octeon_defconfig | 1 + arch/riscv/include/asm/uaccess.h | 4 +- arch/s390/boot/compressed/Makefile | 14 +-- arch/s390/include/asm/mmu_context.h | 5 - arch/s390/include/asm/pgalloc.h | 6 +- arch/s390/include/asm/pgtable.h | 18 +++ arch/s390/include/asm/tlb.h | 6 +- arch/s390/kernel/perf_cpum_cf.c | 2 +- arch/s390/kernel/vdso32/Makefile | 6 +- arch/s390/kernel/vdso64/Makefile | 6 +- arch/s390/mm/pgalloc.c | 1 + arch/s390/numa/numa.c | 1 + arch/um/os-Linux/skas/process.c | 5 + arch/x86/include/asm/page_64_types.h | 12 +- arch/x86/include/asm/pgtable_64_types.h | 4 +- arch/x86/kernel/early_printk.c | 29 +++-- arch/x86/kernel/ldt.c | 59 ++++++---- arch/x86/xen/mmu_pv.c | 6 +- block/bio.c | 1 + drivers/acpi/acpi_platform.c | 1 + drivers/block/brd.c | 16 ++- drivers/clk/clk-fixed-factor.c | 1 + drivers/clk/clk-fixed-rate.c | 1 + drivers/clk/meson/axg.c | 7 +- drivers/clk/meson/gxbb.c | 12 +- drivers/clk/meson/meson8b.c | 3 - drivers/clk/renesas/r9a06g032-clocks.c | 3 +- drivers/clk/samsung/clk-exynos5420.c | 1 + drivers/clk/ti/clk.c | 13 ++- drivers/gnss/serial.c | 3 +- drivers/gnss/sirf.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 - .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 45 ++------ drivers/gpu/drm/drm_edid.c | 3 + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 -- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 11 -- drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 18 +-- drivers/hid/hid-alps.c | 18 +++ drivers/hid/hid-ids.h | 6 + drivers/hid/hid-quirks.c | 4 +- drivers/hid/i2c-hid/i2c-hid.c | 19 +++ drivers/hid/uhid.c | 12 ++ drivers/hwmon/ibmpowernv.c | 7 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 15 +-- drivers/media/v4l2-core/v4l2-event.c | 43 ++++--- drivers/misc/atmel-ssc.c | 2 +- drivers/misc/sgi-gru/grukdump.c | 4 + drivers/mtd/nand/raw/atmel/nand-controller.c | 11 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 10 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 35 ++++-- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 42 ++++--- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 ++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 18 +++ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 14 ++- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 6 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 10 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- drivers/net/ethernet/intel/ice/ice_type.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 1 + drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 +- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 + drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 + drivers/net/ethernet/qlogic/qed/qed_sp.h | 14 +++ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 22 +++- drivers/net/ethernet/qlogic/qed/qed_spq.c | 69 +++++------ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + drivers/net/ethernet/stmicro/stmmac/common.h | 3 +- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 2 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 4 +- drivers/nvme/host/core.c | 4 +- drivers/nvme/host/multipath.c | 1 + drivers/nvme/host/pci.c | 5 +- drivers/of/device.c | 4 +- drivers/platform/x86/acerhdf.c | 1 + drivers/platform/x86/intel_telemetry_debugfs.c | 8 +- drivers/s390/net/qeth_core.h | 5 + drivers/s390/net/qeth_l2_main.c | 5 +- drivers/s390/net/qeth_l3_main.c | 13 ++- drivers/tty/serial/sh-sci.c | 4 +- drivers/uio/uio.c | 7 +- drivers/usb/class/cdc-acm.c | 3 + drivers/usb/core/hub.c | 14 ++- drivers/usb/core/quirks.c | 14 +++ drivers/usb/misc/appledisplay.c | 1 + drivers/xen/grant-table.c | 2 +- fs/afs/rxrpc.c | 5 +- fs/ceph/quota.c | 3 +- fs/cifs/cifsfs.c | 7 +- fs/cifs/smb2ops.c | 11 +- fs/exofs/super.c | 5 +- fs/hfs/brec.c | 4 + fs/hfsplus/brec.c | 4 + fs/reiserfs/xattr.c | 7 ++ include/linux/mtd/nand.h | 2 +- include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/netfilter/ipset/ip_set_comment.h | 4 +- include/linux/usb/quirks.h | 3 + include/uapi/linux/netfilter/nf_tables.h | 4 +- include/uapi/linux/netfilter_bridge.h | 4 + kernel/bpf/syscall.c | 1 + kernel/sched/core.c | 5 +- lib/raid6/test/Makefile | 4 +- net/ceph/messenger.c | 12 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 13 ++- net/netfilter/ipset/ip_set_core.c | 43 +++---- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 +- net/netfilter/ipset/ip_set_list_set.c | 17 ++- net/netfilter/nft_compat.c | 21 ++-- net/netfilter/nft_numgen.c | 127 --------------------- net/netfilter/xt_IDLETIMER.c | 20 ++++ net/sunrpc/xdr.c | 2 +- scripts/package/mkdebian | 7 +- scripts/setlocalversion | 2 +- security/apparmor/lib.c | 6 +- sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_realtek.c | 1 + tools/perf/jvmti/jvmti_agent.c | 49 ++++++-- tools/perf/tests/attr/test-record-group-sampling | 1 - tools/perf/util/evsel.c | 1 - tools/perf/util/symbol-elf.c | 12 +- tools/perf/util/unwind-libdw.c | 4 +- 146 files changed, 853 insertions(+), 578 deletions(-)

6 years, 10 months

7
128
0 0

[PATCH 4.9 00/46] 4.9.141-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.141 release. There are 46 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Nov 28 10:50:18 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.141-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.141-rc1 Ilya Dryomov <idryomov(a)gmail.com> libceph: fall back to sendmsg for slab pages Eric Biggers <ebiggers(a)google.com> HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges Al Viro <viro(a)zeniv.linux.org.uk> new helper: uaccess_kernel() Hans de Goede <hdegoede(a)redhat.com> ACPI / platform: Add SMB0001 HID to forbidden_id_list Gustavo A. R. Silva <gustavo(a)embeddedor.com> drivers/misc/sgi-gru: fix Spectre v1 vulnerability Mattias Jacobsson <2pi(a)mok.nu> USB: misc: appledisplay: add 20" Apple Cinema Display Nathan Chancellor <natechancellor(a)gmail.com> misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data Emmanuel Pescosta <emmanuelpescosta099(a)gmail.com> usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: quirks: Add no-lpm quirk for Raydium touchscreens Maarten Jacobs <maarten256(a)outlook.com> usb: cdc-acm: add entry for Hiro (Conexant) modem Dan Carpenter <dan.carpenter(a)oracle.com> uio: Fix an Oops on load Sakari Ailus <sakari.ailus(a)linux.intel.com> media: v4l: event: Add subscription to list before calling "add" operation Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV" Hans Verkuil <hverkuil(a)xs4all.nl> Revert "media: videobuf2-core: don't call memop 'finish' when queueing" Lu Fengqi <lufq.fnst(a)cn.fujitsu.com> btrfs: fix pinned underflow after transaction aborted Qu Wenruo <wqu(a)suse.com> btrfs: Ensure btrfs_trim_fs can trim the whole filesystem Qu Wenruo <wqu(a)suse.com> btrfs: Enhance btrfs_trim_fs function to handle error better Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / watchdog: Prefer iTCO_wdt always when WDAT table uses RTC SRAM Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Put bitmap buffers in put_super YueHaibing <yuehaibing(a)huawei.com> SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer() Minchan Kim <minchan(a)kernel.org> zram: close udev startup race condition as default groups Denis Bolotin <denis.bolotin(a)cavium.com> qed: Fix blocking/unlimited SPQ entries leak Denis Bolotin <denis.bolotin(a)cavium.com> qed: Fix memory/entry leak in qed_init_sp_request() Vignesh R <vigneshr(a)ti.com> i2c: omap: Enable for ARCH_K3 Jeremy Linton <jeremy.linton(a)arm.com> lib/raid6: Fix arm64 test build Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> clk: fixed-factor: fix of_node_get-put imbalance Geert Uytterhoeven <geert(a)linux-m68k.org> hwmon: (ibmpowernv) Remove bogus __init annotations Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix HiperSockets sniffer Taehee Yoo <ap420073(a)gmail.com> netfilter: xt_IDLETIMER: add sysfs filename checking routine Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment() Justin M. Forbes <jforbes(a)fedoraproject.org> s390/mm: Fix ERROR: "__node_distance" undefined! Eric Westbrook <eric(a)westbrook.io> netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net Vasily Gorbik <gor(a)linux.ibm.com> s390/vdso: add missing FORCE to build targets Nathan Chancellor <natechancellor(a)gmail.com> arm64: percpu: Initialize ret in the default case Paul Gortmaker <paul.gortmaker(a)windriver.com> platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5420: Enable PERIS clocks for suspend Chengguang Xu <cgxu519(a)gmx.com> fs/exofs: fix potential memory leak in mount option parsing Alan Tull <atull(a)kernel.org> clk: fixed-rate: fix of_node_get-put imbalance Rajneesh Bhardwaj <rajneesh.bhardwaj(a)linux.intel.com> platform/x86: intel_telemetry: report debugfs failure Lee, Shawn C <shawn.c.lee(a)intel.com> drm/edid: Add 6 bpc quirk for BOE panel. Richard Weinberger <richard(a)nod.at> um: Give start_idle_thread() a return code Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: prevent btree data loss on root split Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent btree data loss on root split Jann Horn <jannh(a)google.com> reiserfs: propagate errors from fill_with_dentries() properly Colin Ian King <colin.king(a)canonical.com> cifs: don't dereference smb_file_target before null check ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/percpu.h | 3 + arch/s390/kernel/vdso32/Makefile | 6 +- arch/s390/kernel/vdso64/Makefile | 6 +- arch/s390/numa/numa.c | 1 + arch/um/os-Linux/skas/process.c | 5 ++ drivers/acpi/acpi_platform.c | 1 + drivers/acpi/acpi_watchdog.c | 77 ++++++++++++++++++++--- drivers/block/zram/zram_drv.c | 26 ++------ drivers/bluetooth/Kconfig | 1 - drivers/clk/clk-fixed-factor.c | 1 + drivers/clk/clk-fixed-rate.c | 1 + drivers/clk/samsung/clk-exynos5420.c | 1 + drivers/gpu/drm/drm_edid.c | 3 + drivers/hid/uhid.c | 13 ++++ drivers/hwmon/ibmpowernv.c | 7 +-- drivers/i2c/busses/Kconfig | 2 +- drivers/media/v4l2-core/v4l2-event.c | 43 +++++++------ drivers/media/v4l2-core/videobuf2-core.c | 9 +-- drivers/misc/atmel-ssc.c | 2 +- drivers/misc/sgi-gru/grukdump.c | 4 ++ drivers/net/ethernet/qlogic/qed/qed_sp.h | 3 + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 16 ++++- drivers/net/ethernet/qlogic/qed/qed_spq.c | 57 +++++++++-------- drivers/platform/x86/acerhdf.c | 1 + drivers/platform/x86/intel_telemetry_debugfs.c | 8 ++- drivers/s390/net/qeth_l3_main.c | 8 ++- drivers/uio/uio.c | 7 ++- drivers/usb/class/cdc-acm.c | 3 + drivers/usb/core/quirks.c | 8 +++ drivers/usb/misc/appledisplay.c | 1 + fs/btrfs/disk-io.c | 19 ++++-- fs/btrfs/extent-tree.c | 63 ++++++++++++------- fs/btrfs/ioctl.c | 11 ++-- fs/cifs/cifsfs.c | 7 ++- fs/exofs/super.c | 5 +- fs/gfs2/rgrp.c | 3 +- fs/hfs/brec.c | 4 ++ fs/hfsplus/brec.c | 4 ++ fs/reiserfs/xattr.c | 7 +++ include/linux/netfilter/ipset/ip_set_comment.h | 4 +- include/linux/uaccess.h | 3 + lib/raid6/test/Makefile | 4 +- net/ceph/messenger.c | 12 +++- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 +-- net/netfilter/xt_IDLETIMER.c | 20 ++++++ net/sunrpc/xdr.c | 2 +- 47 files changed, 352 insertions(+), 152 deletions(-)

6 years, 10 months

6
51
0 0

stable-rc/linux-4.4.y boot: 50 boots: 0 failed, 49 passed with 1 offline (v4.4.164-71-g4209bc7270f7)

by kernelci.org bot

stable-rc/linux-4.4.y boot: 50 boots: 0 failed, 49 passed with 1 offline (v4.4.164-71-g4209bc7270f7) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.164-71-… Tree: stable-rc Branch: linux-4.4.y Git Describe: v4.4.164-71-g4209bc7270f7 Git Commit: 4209bc7270f7d3a9daba39179d100aed0e025ef0 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 31 unique boards, 15 SoC families, 12 builds out of 187 Offline Platforms: arm: multi_v7_defconfig: stih410-b2120: 1 offline lab --- For more info write to <info(a)kernelci.org>

6 years, 10 months

1
0
0 0

[PATCH v2] PCI: dwc: Fix MSI-X EP framework address calculation bug

by Gustavo Pimentel

Fixes an error caused by 3-bit right rotation on offset address calculation of MSI-X table in dw_pcie_ep_raise_msix_irq(). During the development time, by default the offset address of MSI-X table was set to zero, so that even with a 3-bit right rotation the computed result would still be zero and valid, therefore not being noticed this bug. Fixes: beb4641a787d ("PCI: dwc: Add MSI-X callbacks handler") Signed-off-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> Cc: stable(a)vger.kernel.org --- drivers/pci/controller/dwc/pcie-designware-ep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index 1e7b022..de8635a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -440,7 +440,6 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, tbl_offset = dw_pcie_readl_dbi(pci, reg); bir = (tbl_offset & PCI_MSIX_TABLE_BIR); tbl_offset &= PCI_MSIX_TABLE_OFFSET; - tbl_offset >>= 3; reg = PCI_BASE_ADDRESS_0 + (4 * bir); bar_addr_upper = 0; -- 2.7.4

6 years, 10 months

2
1
0 0

Re: [PATCH] arm: always update thread_info->syscall

by Rafael David Tinoco

On 11/27/18 8:43 AM, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: v4.19, > v4.14, v4.9, v4.4. > > The bot has tested the following trees: v4.19.4, v4.14.83, v4.9.140, v4.4.164, > v3.18.126. > > v4.19.4: Build OK! > v4.14.83: Failed to apply! Possible dependencies: > afc9f65e01cd ("ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+") > > v4.9.140: Failed to apply! Possible dependencies: > afc9f65e01cd ("ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+") > > v4.4.164: Failed to apply! Possible dependencies: > 10573ae547c8 ("ARM: spectre-v1: fix syscall entry") > afc9f65e01cd ("ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+") > > > How should we proceed with this patch? I'm sending a v2 for the same patch. Please hold. Thank you!

6 years, 10 months

1
0
0 0

[PATCH 3.18 00/24] 3.18.127-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 3.18.127 release. There are 24 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Nov 28 10:50:13 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-3.18.127-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-3.18.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 3.18.127-rc1 Eric Biggers <ebiggers(a)google.com> HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges Al Viro <viro(a)zeniv.linux.org.uk> new helper: uaccess_kernel() Hans de Goede <hdegoede(a)redhat.com> ACPI / platform: Add SMB0001 HID to forbidden_id_list Mattias Jacobsson <2pi(a)mok.nu> USB: misc: appledisplay: add 20" Apple Cinema Display Nathan Chancellor <natechancellor(a)gmail.com> misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data Emmanuel Pescosta <emmanuelpescosta099(a)gmail.com> usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: quirks: Add no-lpm quirk for Raydium touchscreens Maarten Jacobs <maarten256(a)outlook.com> usb: cdc-acm: add entry for Hiro (Conexant) modem Dan Carpenter <dan.carpenter(a)oracle.com> uio: Fix an Oops on load Sakari Ailus <sakari.ailus(a)linux.intel.com> media: v4l: event: Add subscription to list before calling "add" operation Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV" YueHaibing <yuehaibing(a)huawei.com> SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer() Sasha Levin <sashal(a)kernel.org> Revert "Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"" Minchan Kim <minchan(a)kernel.org> zram: close udev startup race condition as default groups Vignesh R <vigneshr(a)ti.com> i2c: omap: Enable for ARCH_K3 Jeremy Linton <jeremy.linton(a)arm.com> lib/raid6: Fix arm64 test build Vasily Gorbik <gor(a)linux.ibm.com> s390/vdso: add missing FORCE to build targets Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5420: Enable PERIS clocks for suspend Chengguang Xu <cgxu519(a)gmx.com> fs/exofs: fix potential memory leak in mount option parsing Richard Weinberger <richard(a)nod.at> um: Give start_idle_thread() a return code Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: prevent btree data loss on root split Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent btree data loss on root split Jann Horn <jannh(a)google.com> reiserfs: propagate errors from fill_with_dentries() properly Eric Dumazet <edumazet(a)google.com> net-gro: reset skb->pkt_type in napi_reuse_skb() ------------- Diffstat: Makefile | 4 ++-- arch/s390/kernel/vdso32/Makefile | 6 ++--- arch/s390/kernel/vdso64/Makefile | 6 ++--- arch/um/os-Linux/skas/process.c | 5 +++++ drivers/acpi/acpi_platform.c | 1 + drivers/block/zram/zram_drv.c | 18 +++++---------- drivers/bluetooth/Kconfig | 1 - drivers/clk/samsung/clk-exynos5420.c | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/hid/uhid.c | 13 +++++++++++ drivers/i2c/busses/Kconfig | 2 +- drivers/media/v4l2-core/v4l2-event.c | 43 ++++++++++++++++++++---------------- drivers/misc/atmel-ssc.c | 2 +- drivers/uio/uio.c | 7 ++++-- drivers/usb/class/cdc-acm.c | 3 +++ drivers/usb/core/quirks.c | 8 +++++++ drivers/usb/misc/appledisplay.c | 1 + fs/exofs/super.c | 5 ++++- fs/hfs/brec.c | 4 ++++ fs/hfsplus/brec.c | 4 ++++ fs/reiserfs/xattr.c | 7 ++++++ include/linux/uaccess.h | 3 +++ lib/raid6/test/Makefile | 4 ++-- net/core/dev.c | 4 ++++ net/sunrpc/xdr.c | 2 +- 25 files changed, 107 insertions(+), 49 deletions(-)

6 years, 10 months

5
29
0 0

Re: [PATCH 4/5] userfaultfd: shmem: add i_size checks

by Mike Rapoport

Hi, On Tue, Nov 27, 2018 at 06:57:32AM +0000, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 4c27fe4c4c84 userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support. > > The bot has tested the following trees: v4.19.4, v4.14.83, > > v4.19.4: Build OK! > v4.14.83: Failed to apply! Possible dependencies: > 2a70f6a76bb8 ("memcg, thp: do not invoke oom killer on thp charges") > 2cf855837b89 ("memcontrol: schedule throttling if we are congested") > > > How should we proceed with this patch? Below is the same patch backported to 4.14.83. With it the patch 5/5 in the series applies cleanly. >From 89135f0df0323f38c0b036c87688f5a7e3cfa9e9 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli <aarcange(a)redhat.com> Date: Mon, 26 Nov 2018 12:34:51 -0500 Subject: [PATCH v4.14.83] userfaultfd: shmem: add i_size checks With MAP_SHARED: recheck the i_size after taking the PT lock, to serialize against truncate with the PT lock. Delete the page from the pagecache if the i_size_read check fails. With MAP_PRIVATE: check the i_size after the PT lock before mapping anonymous memory or zeropages into the MAP_PRIVATE shmem mapping. A mostly irrelevant cleanup: like we do the delete_from_page_cache() pagecache removal after dropping the PT lock, the PT lock is a spinlock so drop it before the sleepable page lock. Reviewed-by: Mike Rapoport <rppt(a)linux.ibm.com> Reviewed-by: Hugh Dickins <hughd(a)google.com> Reported-by: Jann Horn <jannh(a)google.com> Fixes: 4c27fe4c4c84 ("userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support") Cc: stable(a)vger.kernel.org Signed-off-by: Andrea Arcangeli <aarcange(a)redhat.com> Signed-off-by: Mike Rapoport <rppt(a)linux.ibm.com> --- mm/shmem.c | 18 ++++++++++++++++-- mm/userfaultfd.c | 26 ++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 8019118..70b9fb9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2238,6 +2238,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, struct page *page; pte_t _dst_pte, *dst_pte; int ret; + pgoff_t offset, max_off; ret = -ENOMEM; if (!shmem_inode_acct_block(inode, 1)) @@ -2275,6 +2276,12 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, __SetPageSwapBacked(page); __SetPageUptodate(page); + ret = -EFAULT; + offset = linear_page_index(dst_vma, dst_addr); + max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + if (unlikely(offset >= max_off)) + goto out_release; + ret = mem_cgroup_try_charge(page, dst_mm, gfp, &memcg, false); if (ret) goto out_release; @@ -2293,8 +2300,14 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, if (dst_vma->vm_flags & VM_WRITE) _dst_pte = pte_mkwrite(pte_mkdirty(_dst_pte)); - ret = -EEXIST; dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl); + + ret = -EFAULT; + max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + if (unlikely(offset >= max_off)) + goto out_release_uncharge_unlock; + + ret = -EEXIST; if (!pte_none(*dst_pte)) goto out_release_uncharge_unlock; @@ -2312,13 +2325,14 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, /* No need to invalidate - it was non-present before */ update_mmu_cache(dst_vma, dst_addr, dst_pte); - unlock_page(page); pte_unmap_unlock(dst_pte, ptl); + unlock_page(page); ret = 0; out: return ret; out_release_uncharge_unlock: pte_unmap_unlock(dst_pte, ptl); + delete_from_page_cache(page); out_release_uncharge: mem_cgroup_cancel_charge(page, memcg, false); out_release: diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 5dbfcac0..5d70fdb 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -34,6 +34,8 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, void *page_kaddr; int ret; struct page *page; + pgoff_t offset, max_off; + struct inode *inode; if (!*pagep) { ret = -ENOMEM; @@ -74,8 +76,17 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, if (dst_vma->vm_flags & VM_WRITE) _dst_pte = pte_mkwrite(pte_mkdirty(_dst_pte)); - ret = -EEXIST; dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl); + if (dst_vma->vm_file) { + /* the shmem MAP_PRIVATE case requires checking the i_size */ + inode = dst_vma->vm_file->f_inode; + offset = linear_page_index(dst_vma, dst_addr); + max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + ret = -EFAULT; + if (unlikely(offset >= max_off)) + goto out_release_uncharge_unlock; + } + ret = -EEXIST; if (!pte_none(*dst_pte)) goto out_release_uncharge_unlock; @@ -109,11 +120,22 @@ static int mfill_zeropage_pte(struct mm_struct *dst_mm, pte_t _dst_pte, *dst_pte; spinlock_t *ptl; int ret; + pgoff_t offset, max_off; + struct inode *inode; _dst_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr), dst_vma->vm_page_prot)); - ret = -EEXIST; dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl); + if (dst_vma->vm_file) { + /* the shmem MAP_PRIVATE case requires checking the i_size */ + inode = dst_vma->vm_file->f_inode; + offset = linear_page_index(dst_vma, dst_addr); + max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + ret = -EFAULT; + if (unlikely(offset >= max_off)) + goto out_unlock; + } + ret = -EEXIST; if (!pte_none(*dst_pte)) goto out_unlock; set_pte_at(dst_mm, dst_addr, dst_pte, _dst_pte); -- 2.7.4 > -- > Thanks, > Sasha > -- Sincerely yours, Mike.

6 years, 10 months

1
0
0 0

patch "tty: do not set TTY_IO_ERROR flag if console port" added to tty-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled tty: do not set TTY_IO_ERROR flag if console port to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 2a48602615e0a2f563549c7d5c8d507f904cf96e Mon Sep 17 00:00:00 2001 From: Chanho Park <parkch98(a)gmail.com> Date: Thu, 22 Nov 2018 18:23:47 +0900 Subject: tty: do not set TTY_IO_ERROR flag if console port Since Commit 761ed4a94582 ('tty: serial_core: convert uart_close to use tty_port_close') and Commit 4dda864d7307 ('tty: serial_core: Fix serial console crash on port shutdown), a serial port which is used as console can be stuck when logging out if there is a remained process. After logged out, agetty will try to grab the serial port but it will be failed because the previous process did not release the port correctly. To fix this, TTY_IO_ERROR bit should not be enabled of tty_port_close if the port is console port. Reproduce step: - Run background processes from serial console $ while true; do sleep 10; done & - Log out $ logout -> Stuck - Read journal log by journalctl | tail Jan 28 16:07:01 ubuntu systemd[1]: Stopped Serial Getty on ttyAMA0. Jan 28 16:07:01 ubuntu systemd[1]: Started Serial Getty on ttyAMA0. Jan 28 16:07:02 ubuntu agetty[1643]: /dev/ttyAMA0: not a tty Fixes: 761ed4a94582 ("tty: serial_core: convert uart_close to use tty_port_close") Cc: Geert Uytterhoeven <geert+renesas(a)glider.be> Cc: Rob Herring <robh(a)kernel.org> Cc: Jiri Slaby <jslaby(a)suse.com> Signed-off-by: Chanho Park <parkch98(a)gmail.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/tty_port.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index cb6075096a5b..044c3cbdcfa4 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -633,7 +633,8 @@ void tty_port_close(struct tty_port *port, struct tty_struct *tty, if (tty_port_close_start(port, tty, filp) == 0) return; tty_port_shutdown(port, tty); - set_bit(TTY_IO_ERROR, &tty->flags); + if (!port->console) + set_bit(TTY_IO_ERROR, &tty->flags); tty_port_close_end(port, tty); tty_port_tty_set(port, NULL); } -- 2.19.2

6 years, 10 months

1
0
0 0

[PATCH] media: imx274: fix stack corruption in imx274_read_reg

by Luca Ceresoli

imx274_read_reg() takes a u8 pointer ("reg") and casts it to pass it to regmap_read(), which takes an unsigned int pointer. This results in a corrupted stack and random crashes. Fixes: 0985dd306f72 ("media: imx274: V4l2 driver for Sony imx274 CMOS sensor") Cc: stable(a)vger.kernel.org # 4.15.x Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> --- Notes! I have no evidence of this bug showing up in the mainline driver. It appeared on a modified version where imx274_read_reg() is used, unmodified, in a different way than it does in mainline (passing a pointer to a single u8 instead of a pointer to an element of a u8 array). Also the bug is only present in versions v4.15 (where the driver was added) to v4.19. The offending function is unused since commit ca017467c78b ("media: imx274: add helper to read multibyte registers"), merged in v4.20-rc1, thus master is not affected. I'm sending this bugfix patch anyway for easier integration in the stable branches. Later I plan to send a patch against master to entirely remove the function. Or somebody might want to use this function again, so better having a fixed version out anyway. I'm not 100% sure this qualifies this commit for stable trees. --- drivers/media/i2c/imx274.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index e1b0395a657f..40c717f13eb8 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -619,16 +619,19 @@ static int imx274_write_table(struct stimx274 *priv, const struct reg_8 table[]) static inline int imx274_read_reg(struct stimx274 *priv, u16 addr, u8 *val) { + unsigned int uint_val; int err; - err = regmap_read(priv->regmap, addr, (unsigned int *)val); + err = regmap_read(priv->regmap, addr, &uint_val); if (err) dev_err(&priv->client->dev, "%s : i2c read failed, addr = %x\n", __func__, addr); else dev_dbg(&priv->client->dev, "%s : addr 0x%x, val=0x%x\n", __func__, - addr, *val); + addr, uint_val); + + *val = uint_val; return err; } -- 2.17.1

6 years, 10 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror