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

[PATCH 4.20 000/117] 4.20.6-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.20.6 release. There are 117 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 Thu Jan 31 11:31:34 UTC 2019. 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.20.6-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.20.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.20.6-rc1 Christoph Hellwig <hch(a)lst.de> ide: fix a typo in the settings proc file name Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> mt76x0: phy: unify calibration between mt76x0u and mt76x0e Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x0: antenna select corrections Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x0: do not perform MCU calibration for MT7630 Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x02: assure we update gain after scan Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x02: run calibration after scanning Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x0: use band parameter for LC calibration Stanislaw Gruszka <sgruszka(a)redhat.com> mt76x0: do not overwrite other MT_BBP(AGC, 8) fields Jack Pham <jackp(a)codeaurora.org> usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup Michal Hocko <mhocko(a)suse.com> Revert "mm, memory_hotplug: initialize struct pages for the full memory section" Dexuan Cui <decui(a)microsoft.com> vmbus: fix subchannel removal Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: Remove the useless API vmbus_get_outgoing_channel() Daniel Borkmann <daniel(a)iogearbox.net> bpf: fix inner map masking to prevent oob under speculation Daniel Borkmann <daniel(a)iogearbox.net> bpf: fix sanitation of alu op with pointer / scalar type from different paths Daniel Borkmann <daniel(a)iogearbox.net> bpf: prevent out of bounds speculation on pointer arithmetic Daniel Borkmann <daniel(a)iogearbox.net> bpf: fix check_map_access smin_value test when pointer contains offset Daniel Borkmann <daniel(a)iogearbox.net> bpf: restrict unknown scalars of mixed signed bounds for unprivileged Daniel Borkmann <daniel(a)iogearbox.net> bpf: restrict stack pointer arithmetic for unprivileged Daniel Borkmann <daniel(a)iogearbox.net> bpf: restrict map value pointer arithmetic for unprivileged Daniel Borkmann <daniel(a)iogearbox.net> bpf: enable access to ax register also from verifier rewrite Raju Rangoju <rajur(a)chelsio.com> nvmet-rdma: fix null dereference under heavy load Israel Rukshin <israelr(a)mellanox.com> nvmet-rdma: Add unlikely for response allocated check Daniel Borkmann <daniel(a)iogearbox.net> bpf: move tmp variable into ax register in interpreter Daniel Borkmann <daniel(a)iogearbox.net> bpf: move {prev_,}insn_idx into verifier env Neil Armstrong <narmstrong(a)baylibre.com> drm/meson: Fix atomic mode switching regression Nicolas Pitre <nicolas.pitre(a)linaro.org> vt: invoke notifier on screen size change Nicolas Pitre <nicolas.pitre(a)linaro.org> vt: always call notifier with the console lock held Nicolas Pitre <nicolas.pitre(a)linaro.org> vt: make vt_console_print() compatible with the unicode screen buffer Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> can: flexcan: fix NULL pointer exception during bringup Oliver Hartkopp <socketcan(a)hartkopp.net> can: bcm: check timer values before ktime conversion Manfred Schlaegl <manfred.schlaegl(a)ginzinger.com> can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it Marc Zyngier <marc.zyngier(a)arm.com> irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size Thomas Gleixner <tglx(a)linutronix.de> net: sun: cassini: Cleanup license conflict Thomas Gleixner <tglx(a)linutronix.de> posix-cpu-timers: Unbreak timer rearming Jan Beulich <JBeulich(a)suse.com> x86/entry/64/compat: Fix stack switching for XEN PV Daniel Drake <drake(a)endlessm.com> x86/kaslr: Fix incorrect i8254 outb() parameters Dave Hansen <dave.hansen(a)linux.intel.com> x86/selftests/pkeys: Fork() to check for state being preserved Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys: Properly copy pkey state at fork() Tom Roeder <tmroeder(a)google.com> kvm: x86/vmx: Use kzalloc for cached_vmcs12 Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: WARN_ONCE if sending a PV IPI returns a fatal error Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: Fix PV IPIs for 32-bit KVM host Alexander Popov <alex.popov(a)linux.com> KVM: x86: Fix single-step debugging Thor Thayer <thor.thayer(a)linux.intel.com> EDAC, altera: Fix S10 persistent register offset Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: Add APTX quirk for Lenovo laptop Milan Broz <gmazyland(a)gmail.com> dm crypt: fix parsing of extended IV arguments Joe Thornber <ejt(a)redhat.com> dm thin: fix passdown_double_checking_shared_status() Marc Gonzalez <marc.w.gonzalez(a)free.fr> scsi: ufs: Use explicit access size in ufshcd_dump_regs Dan Williams <dan.j.williams(a)intel.com> acpi/nfit: Fix command-supported detection Dan Williams <dan.j.williams(a)intel.com> acpi/nfit: Block function zero DSMs Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: uinput - fix undefined behavior in uinput_validate_absinfo() Deepa Dinamani <deepa.kernel(a)gmail.com> Input: input_event - provide override for sparc64 Tom Panfil <tom(a)steelseries.com> Input: xpad - add support for SteelSeries Stratus Duo Ronnie Sahlberg <lsahlber(a)redhat.com> smb3: add credits we receive from oplock/break PDUs Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Do not reconnect TCP session in add_credits() Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Fix credit calculation for encrypted reads with errors Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Fix credits calculations for reads with errors Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Fix possible hang during async MTU reads and writes Nicolas Pitre <nicolas.pitre(a)linaro.org> vgacon: unconfuse vc_origin when using soft scrollback Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: Check for ring when getting debug info Vitaly Kuznetsov <vkuznets(a)redhat.com> hv_balloon: avoid touching uninitialized struct page during tail onlining Paul Fulghum <paulkf(a)microgate.com> tty/n_hdlc: fix __might_sleep warning Samir Virmani <samir(a)embedur.com> uart: Fix crash in uart_write and uart_put_char Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> tty: Handle problem if line discipline does not have receive_buf Michael Straube <straube.linux(a)gmail.com> staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1 Remi Pommarel <repk(a)triplefau.lt> mmc: meson-gx: Free irq in release() callback Liming Sun <lsun(a)mellanox.com> mmc: dw_mmc-bluefield: : Fix the license information Stefan Wahren <stefan.wahren(a)i2se.com> mmc: sdhci-iproc: handle mmc_of_parse() errors during probe Gustavo A. R. Silva <gustavo(a)embeddedor.com> char/mwave: fix potential Spectre v1 vulnerability Gustavo A. R. Silva <gustavo(a)embeddedor.com> misc: ibmvsm: Fix potential NULL pointer dereference David Hildenbrand <david(a)redhat.com> s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU Gerald Schaefer <gerald.schaefer(a)de.ibm.com> s390/smp: fix CPU hotplug deadlock with CPU rescan Christian Borntraeger <borntraeger(a)de.ibm.com> s390/early: improve machine detection Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/mm: always force a load of the primary ASCE on context switch Vasily Gorbik <gor(a)linux.ibm.com> s390/vdso: correct vdso mapping for compat tasks Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> ARC: perf: map generic branches to correct hardware condition Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> ARC: adjust memblock_reserve of kernel memory Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> ARCv2: lib: memeset: fix doing prefetchw outside of buffer Anthony Wong <anthony.wong(a)canonical.com> ALSA: hda - Add mute LED support for HP ProBook 470 G5 Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fix typo for ALC225 model Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> inotify: Fix fd refcount leak in inotify_add_watch(). Dinh Nguyen <dinguyen(a)kernel.org> clk: socfpga: stratix10: fix naming convention for the fixed-clocks Dinh Nguyen <dinguyen(a)kernel.org> clk: socfpga: stratix10: fix rate calculation for pll clocks Gustavo A. R. Silva <gustavo(a)embeddedor.com> clk: zynqmp: Fix memory allocation in zynqmp_clk_setup b-ak <anur.bhargav(a)gmail.com> ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode Gustavo A. R. Silva <gustavo(a)embeddedor.com> ASoC: rt5514-spi: Fix potential NULL pointer dereference Kangjie Lu <kjlu(a)umn.edu> ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages Yan, Zheng <zyan(a)redhat.com> ceph: clear inode pointer when snap realm gets dropped by its inode Charles Yeh <charlesyeh522(a)gmail.com> USB: serial: pl2303: add new PID to support PL2303TB Max Schulze <max.schulze(a)posteo.de> USB: serial: simple: add Motorola Tetra TPG2200 device id Karoly Pados <pados(a)pados.hu> USB: serial: ftdi_sio: fix GPIO not working in autosuspend Lubomir Rintel <lkundrak(a)v3.sk> USB: EHCI: ehci-mv: add MODULE_DEVICE_TABLE Christian Lamparter <chunkeey(a)gmail.com> USB: leds: fix regression in usbport led trigger Tomas Winkler <tomas.winkler(a)intel.com> mei: me: add denverton innovation engine device IDs Alexander Usyskin <alexander.usyskin(a)intel.com> mei: me: mark LBG devices as having dma support Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Address Kerberos performance/behavior regression Russell King <rmk+kernel(a)armlinux.org.uk> ARM: fix the cockup in the previous patch Willem de Bruijn <willemb(a)google.com> tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state Hangbin Liu <liuhangbin(a)gmail.com> ip6_gre: update version related info when changing link Andrew Lunn <andrew(a)lunn.ch> net: phy: marvell: Fix deadlock from wrong locking Xin Long <lucien.xin(a)gmail.com> erspan: build the header with the right proto according to erspan_ver Olivier Matz <olivier.matz(a)6wind.com> ip6_gre: fix tunnel list corruption for x-netns Willem de Bruijn <willemb(a)google.com> udp: with udp_segment release on error path Ivan Vecera <ivecera(a)redhat.com> net/sched: cls_flower: allocate mask dynamically in fl_change() Ido Schimmel <idosch(a)mellanox.com> mlxsw: pci: Ring CQ's doorbell before RDQ's Nir Dotan <nird(a)mellanox.com> mlxsw: spectrum_fid: Update dummy FID index Ido Schimmel <idosch(a)mellanox.com> net: ipv4: Fix memory leak in network namespace dismantle Nir Dotan <nird(a)mellanox.com> mlxsw: pci: Increase PCI SW reset timeout Jason Wang <jasowang(a)redhat.com> vhost: log dirty page correctly Ross Lagerwall <ross.lagerwall(a)citrix.com> openvswitch: Avoid OOB read when parsing flow nlattrs Cong Wang <xiyou.wangcong(a)gmail.com> net_sched: refetch skb protocol for each filter Davide Caratti <dcaratti(a)redhat.com> net/sched: act_tunnel_key: fix memory leak in case of action replace Camelia Groza <camelia.groza(a)nxp.com> net: phy: phy driver features are mandatory Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling Andrew Lunn <andrew(a)lunn.ch> net: phy: marvell: Errata for mv88e6390 internal PHYs Ross Lagerwall <ross.lagerwall(a)citrix.com> net: Fix usage of pskb_trim_rcsum Yunjian Wang <wangyunjian(a)huawei.com> net: bridge: Fix ethernet header pointer before check skb forwardable Lendacky, Thomas <Thomas.Lendacky(a)amd.com> amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs ------------- Diffstat: Makefile | 4 +- arch/arc/include/asm/perf_event.h | 3 +- arch/arc/lib/memset-archs.S | 40 ++- arch/arc/mm/init.c | 3 +- arch/arm/mm/proc-macros.S | 4 +- arch/s390/include/asm/mmu_context.h | 7 +- arch/s390/kernel/early.c | 4 +- arch/s390/kernel/setup.c | 2 + arch/s390/kernel/smp.c | 11 +- arch/s390/kernel/vdso.c | 5 +- arch/x86/entry/entry_64_compat.S | 6 +- arch/x86/include/asm/mmu_context.h | 18 + arch/x86/kernel/kvm.c | 7 +- arch/x86/kvm/vmx.c | 12 +- arch/x86/kvm/x86.c | 5 +- arch/x86/lib/kaslr.c | 4 +- drivers/acpi/nfit/core.c | 61 +++- drivers/char/mwave/mwavedd.c | 7 + drivers/clk/socfpga/clk-pll-s10.c | 2 +- drivers/clk/socfpga/clk-s10.c | 20 +- drivers/clk/zynqmp/clkc.c | 4 +- drivers/edac/altera_edac.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 + drivers/gpu/drm/meson/meson_crtc.c | 23 +- drivers/gpu/drm/meson/meson_drv.c | 5 + drivers/hv/channel.c | 10 +- drivers/hv/channel_mgmt.c | 44 --- drivers/hv/hv_balloon.c | 10 +- drivers/hv/ring_buffer.c | 31 +- drivers/hv/vmbus_drv.c | 91 +++-- drivers/ide/ide-proc.c | 2 +- drivers/input/joystick/xpad.c | 3 + drivers/input/misc/uinput.c | 5 +- drivers/irqchip/irq-gic-v3-its.c | 25 +- drivers/md/dm-crypt.c | 25 +- drivers/md/dm-thin-metadata.c | 4 +- drivers/md/dm-thin-metadata.h | 2 +- drivers/md/dm-thin.c | 10 +- drivers/misc/ibmvmc.c | 7 +- drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 4 +- drivers/mmc/host/dw_mmc-bluefield.c | 5 - drivers/mmc/host/meson-gx-mmc.c | 18 +- drivers/mmc/host/sdhci-iproc.c | 5 +- drivers/net/can/dev.c | 27 +- drivers/net/can/flexcan.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 - drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 22 +- drivers/net/ethernet/mellanox/mlxsw/pci.c | 12 +- drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 3 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 +- drivers/net/ethernet/sun/cassini.c | 15 +- drivers/net/ethernet/sun/cassini.h | 15 +- drivers/net/phy/marvell.c | 37 ++- drivers/net/phy/mdio_bus.c | 1 + drivers/net/phy/phy_device.c | 5 + drivers/net/ppp/pppoe.c | 1 + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 9 +- drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 5 + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 170 +++------- drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + .../net/wireless/mediatek/mt76/mt76x02_eeprom.h | 10 +- drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 1 + .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 3 + drivers/nvme/target/rdma.c | 17 +- drivers/s390/char/sclp_config.c | 2 + drivers/scsi/ufs/ufshcd.c | 10 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + drivers/tty/n_hdlc.c | 1 + drivers/tty/serial/serial_core.c | 12 +- drivers/tty/tty_io.c | 3 +- drivers/tty/vt/vt.c | 50 +-- drivers/usb/core/ledtrig-usbport.c | 17 +- drivers/usb/dwc3/gadget.c | 2 + drivers/usb/host/ehci-mv.c | 1 + drivers/usb/serial/ftdi_sio.c | 15 +- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 2 + drivers/usb/serial/usb-serial-simple.c | 3 +- drivers/vhost/net.c | 3 +- drivers/vhost/vhost.c | 97 +++++- drivers/vhost/vhost.h | 3 +- drivers/video/console/vgacon.c | 7 +- fs/ceph/caps.c | 2 + fs/cifs/cifssmb.c | 35 +- fs/cifs/connect.c | 21 ++ fs/cifs/smb2misc.c | 7 + fs/cifs/smb2ops.c | 62 ++-- fs/notify/inotify/inotify_user.c | 6 +- include/linux/bpf_verifier.h | 13 + include/linux/filter.h | 10 +- include/linux/hyperv.h | 22 +- include/linux/phy.h | 4 +- include/linux/skbuff.h | 1 + include/net/ip_fib.h | 2 +- include/uapi/linux/input.h | 6 +- kernel/bpf/core.c | 54 ++- kernel/bpf/map_in_map.c | 17 +- kernel/bpf/verifier.c | 369 +++++++++++++++++---- kernel/time/posix-cpu-timers.c | 1 + mm/page_alloc.c | 12 - net/bridge/br_forward.c | 9 +- net/bridge/br_netfilter_ipv6.c | 1 + net/bridge/netfilter/nft_reject_bridge.c | 1 + net/can/bcm.c | 27 ++ net/ipv4/fib_frontend.c | 4 +- net/ipv4/fib_trie.c | 15 +- net/ipv4/ip_gre.c | 23 +- net/ipv4/ip_input.c | 1 + net/ipv4/tcp.c | 2 +- net/ipv4/udp.c | 16 +- net/ipv6/ip6_gre.c | 14 +- net/ipv6/udp.c | 16 +- net/openvswitch/flow_netlink.c | 2 +- net/sched/act_tunnel_key.c | 19 +- net/sched/cls_api.c | 3 +- net/sched/cls_flower.c | 19 +- net/sunrpc/xprt.c | 2 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 2 +- sound/soc/codecs/rt5514-spi.c | 2 + sound/soc/codecs/tlv320aic32x4.c | 4 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +- tools/testing/selftests/x86/protection_keys.c | 41 ++- 126 files changed, 1326 insertions(+), 709 deletions(-)

6 years, 7 months

4
123
0 0

RE: [PATCH] nfit: acpi_nfit_ctl(): check out_obj->type in the right place

by Dexuan Cui

> From: Sasha Levin <sashal(a)kernel.org> > Sent: Wednesday, January 30, 2019 6:05 PM > To: Sasha Levin <sashal(a)kernel.org>; Dexuan Cui <decui(a)microsoft.com>; > Dan Williams <dan.j.williams(a)intel.com> > Cc: Josh Poulson <jopoulso(a)microsoft.com>; stable(a)vger.kernel.org; > stable(a)vger.kernel.org > Subject: Re: [PATCH] nfit: acpi_nfit_ctl(): check out_obj->type in the right place > > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 31eca76ba2fc nfit, libnvdimm: limited/whitelisted dimm > command marshaling mechanism. > > The bot has tested the following trees: v4.20.5, v4.19.18, v4.14.96, v4.9.153. > > v4.20.5: Build OK! > v4.19.18: Build OK! > v4.14.96: Failed to apply! Possible dependencies: > 06e8ccdab15f ("acpi: nfit: Add support for detect platform CPU cache > flush on power loss") > b37b3fd33d03 ("acpi nfit: Enable to show what feature is supported via > ND_CMD_CALL for nfit_test") > b814735f5ca4 ("acpi, nfit: remove redundant __func__ in dev_dbg") > > v4.9.153: Failed to apply! Possible dependencies: > 010426079ec1 ("sched/headers: Prepare for new header dependencies > before moving more code to <linux/sched/mm.h>") > 06e8ccdab15f ("acpi: nfit: Add support for detect platform CPU cache > flush on power loss") > 0b277961f448 ("libnvdimm, pmem: disable dax flushing when pmem is > fronting a volatile region") > 39bc88e5e38e ("arm64: Disable TTBR0_EL1 during normal kernel > execution") > 3f07c0144132 ("sched/headers: Prepare for new header dependencies > before moving code to <linux/sched/signal.h>") > 50d34394cee6 ("sched/headers: Prepare to remove the <linux/magic.h> > include from <linux/sched/task_stack.h>") > 68db0cf10678 ("sched/headers: Prepare for new header dependencies > before moving code to <linux/sched/task_stack.h>") > 7699a6a36b82 ("acpi, nfit: kill ACPI_NFIT_DEBUG") > 7b6be8444e0f ("dax: refactor dax-fs into a generic provider of 'struct > dax_device' instances") > 7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> > globally") > 9cf09d68b89a ("arm64: xen: Enable user access before a privcmd hvc > call") > b37b3fd33d03 ("acpi nfit: Enable to show what feature is supported via > ND_CMD_CALL for nfit_test") > b814735f5ca4 ("acpi, nfit: remove redundant __func__ in dev_dbg") > bd38967d406f ("arm64: Factor out PAN enabling/disabling into separate > uaccess_* macros") > c1d6e828a35d ("pmem: add dax_operations support") > caa603aae0cc ("acpi, nfit: collate health state flags") > > > How should we proceed with this patch? > > -- > Thanks, > Sasha It's a small pach and I can quickly rebase it to v4.14.96 and v4.9.153 once it goes into Linus's tree. Thanks, -- Dexuan

6 years, 7 months

1
0
0 0

Re: [PATCH v1] pinctrl: mediatek: improve Kconfig dependencies

by Ryder Lee

CC: stable(a)vger.kernel.org On Fri, 2018-12-21 at 18:17 +0800, Linus Walleij wrote: > On Thu, Dec 13, 2018 at 3:28 AM Ryder Lee <ryder.lee(a)mediatek.com> wrote: > > > Remove prompts to make all pinctrl cores to non-visible symbols and > > make sure the target SoCs would be coupled with the corresponding > > cores. > > > > Signed-off-by: Ryder Lee <ryder.lee(a)mediatek.com> > > Patch applied with ACK and Tested-by. > > Yours, > Linus Walleij I forgot to add stable-kernel into CC list. This patch should be applied to stable-rc linux-4.20.y. Sorry for the inconvenience. Ryder

6 years, 7 months

1
1
0 0

patch "staging: erofs: keep corrupted fs from crashing kernel in" added to staging-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: erofs: keep corrupted fs from crashing kernel in to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-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 d4104c5e783f5d053b97268fb92001d785de7dd5 Mon Sep 17 00:00:00 2001 From: Gao Xiang <gaoxiang25(a)huawei.com> Date: Tue, 29 Jan 2019 23:55:40 +0800 Subject: staging: erofs: keep corrupted fs from crashing kernel in erofs_namei() As Al pointed out, " ... and while we are at it, what happens to unsigned int nameoff = le16_to_cpu(de[mid].nameoff); unsigned int matched = min(startprfx, endprfx); struct qstr dname = QSTR_INIT(data + nameoff, unlikely(mid >= ndirents - 1) ? maxsize - nameoff : le16_to_cpu(de[mid + 1].nameoff) - nameoff); /* string comparison without already matched prefix */ int ret = dirnamecmp(name, &dname, &matched); if le16_to_cpu(de[...].nameoff) is not monotonically increasing? I.e. what's to prevent e.g. (unsigned)-1 ending up in dname.len? Corrupted fs image shouldn't oops the kernel.. " Revisit the related lookup flow to address the issue. Fixes: d72d1ce60174 ("staging: erofs: add namei functions") Cc: <stable(a)vger.kernel.org> # 4.19+ Suggested-by: Al Viro <viro(a)ZenIV.linux.org.uk> Signed-off-by: Gao Xiang <gaoxiang25(a)huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/erofs/namei.c | 167 ++++++++++++++++++---------------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c index 5596c52e246d..a1300c420e63 100644 --- a/drivers/staging/erofs/namei.c +++ b/drivers/staging/erofs/namei.c @@ -15,74 +15,76 @@ #include <trace/events/erofs.h> -/* based on the value of qn->len is accurate */ -static inline int dirnamecmp(struct qstr *qn, - struct qstr *qd, unsigned int *matched) +struct erofs_qstr { + const unsigned char *name; + const unsigned char *end; +}; + +/* based on the end of qn is accurate and it must have the trailing '\0' */ +static inline int dirnamecmp(const struct erofs_qstr *qn, + const struct erofs_qstr *qd, + unsigned int *matched) { - unsigned int i = *matched, len = min(qn->len, qd->len); -loop: - if (unlikely(i >= len)) { - *matched = i; - if (qn->len < qd->len) { - /* - * actually (qn->len == qd->len) - * when qd->name[i] == '\0' - */ - return qd->name[i] == '\0' ? 0 : -1; + unsigned int i = *matched; + + /* + * on-disk error, let's only BUG_ON in the debugging mode. + * otherwise, it will return 1 to just skip the invalid name + * and go on (in consideration of the lookup performance). + */ + DBG_BUGON(qd->name > qd->end); + + /* qd could not have trailing '\0' */ + /* However it is absolutely safe if < qd->end */ + while (qd->name + i < qd->end && qd->name[i] != '\0') { + if (qn->name[i] != qd->name[i]) { + *matched = i; + return qn->name[i] > qd->name[i] ? 1 : -1; } - return (qn->len > qd->len); + ++i; } - - if (qn->name[i] != qd->name[i]) { - *matched = i; - return qn->name[i] > qd->name[i] ? 1 : -1; - } - - ++i; - goto loop; + *matched = i; + /* See comments in __d_alloc on the terminating NUL character */ + return qn->name[i] == '\0' ? 0 : 1; } -static struct erofs_dirent *find_target_dirent( - struct qstr *name, - u8 *data, int maxsize) +#define nameoff_from_disk(off, sz) (le16_to_cpu(off) & ((sz) - 1)) + +static struct erofs_dirent *find_target_dirent(struct erofs_qstr *name, + u8 *data, + unsigned int dirblksize, + const int ndirents) { - unsigned int ndirents, head, back; + int head, back; unsigned int startprfx, endprfx; struct erofs_dirent *const de = (struct erofs_dirent *)data; - /* make sure that maxsize is valid */ - BUG_ON(maxsize < sizeof(struct erofs_dirent)); - - ndirents = le16_to_cpu(de->nameoff) / sizeof(*de); - - /* corrupted dir (may be unnecessary...) */ - BUG_ON(!ndirents); - head = 0; back = ndirents - 1; startprfx = endprfx = 0; while (head <= back) { - unsigned int mid = head + (back - head) / 2; - unsigned int nameoff = le16_to_cpu(de[mid].nameoff); + const int mid = head + (back - head) / 2; + const int nameoff = nameoff_from_disk(de[mid].nameoff, + dirblksize); unsigned int matched = min(startprfx, endprfx); - - struct qstr dname = QSTR_INIT(data + nameoff, - unlikely(mid >= ndirents - 1) ? - maxsize - nameoff : - le16_to_cpu(de[mid + 1].nameoff) - nameoff); + struct erofs_qstr dname = { + .name = data + nameoff, + .end = unlikely(mid >= ndirents - 1) ? + data + dirblksize : + data + nameoff_from_disk(de[mid + 1].nameoff, + dirblksize) + }; /* string comparison without already matched prefix */ int ret = dirnamecmp(name, &dname, &matched); - if (unlikely(!ret)) + if (unlikely(!ret)) { return de + mid; - else if (ret > 0) { + } else if (ret > 0) { head = mid + 1; startprfx = matched; - } else if (unlikely(mid < 1)) /* fix "mid" overflow */ - break; - else { + } else { back = mid - 1; endprfx = matched; } @@ -91,12 +93,13 @@ static struct erofs_dirent *find_target_dirent( return ERR_PTR(-ENOENT); } -static struct page *find_target_block_classic( - struct inode *dir, - struct qstr *name, int *_diff) +static struct page *find_target_block_classic(struct inode *dir, + struct erofs_qstr *name, + int *_diff, + int *_ndirents) { unsigned int startprfx, endprfx; - unsigned int head, back; + int head, back; struct address_space *const mapping = dir->i_mapping; struct page *candidate = ERR_PTR(-ENOENT); @@ -105,33 +108,34 @@ static struct page *find_target_block_classic( back = inode_datablocks(dir) - 1; while (head <= back) { - unsigned int mid = head + (back - head) / 2; + const int mid = head + (back - head) / 2; struct page *page = read_mapping_page(mapping, mid, NULL); - if (IS_ERR(page)) { -exact_out: - if (!IS_ERR(candidate)) /* valid candidate */ - put_page(candidate); - return page; - } else { - int diff; - unsigned int ndirents, matched; - struct qstr dname; + if (!IS_ERR(page)) { struct erofs_dirent *de = kmap_atomic(page); - unsigned int nameoff = le16_to_cpu(de->nameoff); - - ndirents = nameoff / sizeof(*de); + const int nameoff = nameoff_from_disk(de->nameoff, + EROFS_BLKSIZ); + const int ndirents = nameoff / sizeof(*de); + int diff; + unsigned int matched; + struct erofs_qstr dname; - /* corrupted dir (should have one entry at least) */ - BUG_ON(!ndirents || nameoff > PAGE_SIZE); + if (unlikely(!ndirents)) { + DBG_BUGON(1); + put_page(page); + page = ERR_PTR(-EIO); + goto out; + } matched = min(startprfx, endprfx); dname.name = (u8 *)de + nameoff; - dname.len = ndirents == 1 ? - /* since the rest of the last page is 0 */ - EROFS_BLKSIZ - nameoff - : le16_to_cpu(de[1].nameoff) - nameoff; + if (ndirents == 1) + dname.end = (u8 *)de + EROFS_BLKSIZ; + else + dname.end = (u8 *)de + + nameoff_from_disk(de[1].nameoff, + EROFS_BLKSIZ); /* string comparison without already matched prefix */ diff = dirnamecmp(name, &dname, &matched); @@ -139,7 +143,7 @@ static struct page *find_target_block_classic( if (unlikely(!diff)) { *_diff = 0; - goto exact_out; + goto out; } else if (diff > 0) { head = mid + 1; startprfx = matched; @@ -147,35 +151,42 @@ static struct page *find_target_block_classic( if (likely(!IS_ERR(candidate))) put_page(candidate); candidate = page; + *_ndirents = ndirents; } else { put_page(page); - if (unlikely(mid < 1)) /* fix "mid" overflow */ - break; - back = mid - 1; endprfx = matched; } + continue; } +out: /* free if the candidate is valid */ + if (!IS_ERR(candidate)) + put_page(candidate); + return page; } *_diff = 1; return candidate; } int erofs_namei(struct inode *dir, - struct qstr *name, - erofs_nid_t *nid, unsigned int *d_type) + struct qstr *name, + erofs_nid_t *nid, unsigned int *d_type) { - int diff; + int diff, ndirents; struct page *page; u8 *data; struct erofs_dirent *de; + struct erofs_qstr qn; if (unlikely(!dir->i_size)) return -ENOENT; + qn.name = name->name; + qn.end = name->name + name->len; + diff = 1; - page = find_target_block_classic(dir, name, &diff); + page = find_target_block_classic(dir, &qn, &diff, &ndirents); if (unlikely(IS_ERR(page))) return PTR_ERR(page); @@ -184,7 +195,7 @@ int erofs_namei(struct inode *dir, /* the target page has been mapped */ de = likely(diff) ? /* since the rest of the last page is 0 */ - find_target_dirent(name, data, EROFS_BLKSIZ) : + find_target_dirent(&qn, data, EROFS_BLKSIZ, ndirents) : (struct erofs_dirent *)data; if (likely(!IS_ERR(de))) { -- 2.20.1

6 years, 7 months

5
5
0 0

+ huegtlbfs-fix-page-leak-during-migration-of-file-pages.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: huegtlbfs: fix page leak during migration of file pages has been added to the -mm tree. Its filename is huegtlbfs-fix-page-leak-during-migration-of-file-pages.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/huegtlbfs-fix-page-leak-during-mig… and later at http://ozlabs.org/~akpm/mmotm/broken-out/huegtlbfs-fix-page-leak-during-mig… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mike Kravetz <mike.kravetz(a)oracle.com> Subject: huegtlbfs: fix page leak during migration of file pages Files can be created and mapped in an explicitly mounted hugetlbfs filesystem. If pages in such files are migrated, the filesystem usage will not be decremented for the associated pages. This can result in mmap or page allocation failures as it appears there are fewer pages in the filesystem than there should be. For example, a test program which hole punches, faults and migrates pages in such a file (1G in size) will eventually fail because it can not allocate a page. Reported counts and usage at time of failure: node0 537 free_hugepages 1024 nr_hugepages 0 surplus_hugepages node1 1000 free_hugepages 1024 nr_hugepages 0 surplus_hugepages Filesystem Size Used Avail Use% Mounted on nodev 4.0G 4.0G 0 100% /var/opt/hugepool Note that the filesystem shows 4G of pages used, while actual usage is 511 pages (just under 1G). Failed trying to allocate page 512. If a hugetlb page is associated with an explicitly mounted filesystem, this information in contained in the page_private field. At migration time, this information is not preserved. To fix, simply transfer page_private from old to new page at migration time if necessary. Also, migrate_page_states() unconditionally clears page_private and PagePrivate of the old page. It is unlikely, but possible that these fields could be non-NULL and are needed at hugetlb free page time. So, do not touch these fields for hugetlb pages. Link: http://lkml.kernel.org/r/20190130211443.16678-1-mike.kravetz@oracle.com Fixes: 290408d4a250 ("hugetlb: hugepage migration core") Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: Michal Hocko <mhocko(a)kernel.org> Cc: Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> Cc: Andrea Arcangeli <aarcange(a)redhat.com> Cc: "Kirill A . Shutemov" <kirill.shutemov(a)linux.intel.com> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Davidlohr Bueso <dave(a)stgolabs.net> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/hugetlbfs/inode.c | 10 ++++++++++ mm/migrate.c | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) --- a/fs/hugetlbfs/inode.c~huegtlbfs-fix-page-leak-during-migration-of-file-pages +++ a/fs/hugetlbfs/inode.c @@ -859,6 +859,16 @@ static int hugetlbfs_migrate_page(struct rc = migrate_huge_page_move_mapping(mapping, newpage, page); if (rc != MIGRATEPAGE_SUCCESS) return rc; + + /* + * page_private is subpool pointer in hugetlb pages, transfer + * if needed. + */ + if (page_private(page) && !page_private(newpage)) { + set_page_private(newpage, page_private(page)); + set_page_private(page, 0); + } + if (mode != MIGRATE_SYNC_NO_COPY) migrate_page_copy(newpage, page); else --- a/mm/migrate.c~huegtlbfs-fix-page-leak-during-migration-of-file-pages +++ a/mm/migrate.c @@ -641,8 +641,14 @@ void migrate_page_states(struct page *ne */ if (PageSwapCache(page)) ClearPageSwapCache(page); - ClearPagePrivate(page); - set_page_private(page, 0); + /* + * Unlikely, but PagePrivate and page_private could potentially + * contain information needed at hugetlb free page time. + */ + if (!PageHuge(page)) { + ClearPagePrivate(page); + set_page_private(page, 0); + } /* * If any waiters have accumulated on the new page then _ Patches currently in -mm which might be from mike.kravetz(a)oracle.com are huegtlbfs-fix-page-leak-during-migration-of-file-pages.patch

6 years, 7 months

1
0
0 0

[PATCH] gfs2: Fix loop in gfs2_rbm_find (2)

by Andreas Gruenbacher

The fix from commit 2d29f6b96d8f introduced an unexpected performance regression when allocating blocks. Fix by rewriting the overly complicated wrap-around logic in gfs2_rbm_find in a more reasonable way. Discovered and verified with iozone. Fixes: 2d29f6b96d8f ("gfs2: Fix loop in gfs2_rbm_find") Cc: stable(a)vger.kernel.org # v3.13+ Signed-off-by: Andreas Gruenbacher <agruenba(a)redhat.com> --- fs/gfs2/rgrp.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 831d7cb5a49c4..3f16411d885d9 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1730,25 +1730,15 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, const struct gfs2_inode *ip, bool nowrap) { struct buffer_head *bh; - int initial_bii; - u32 initial_offset; int first_bii = rbm->bii; u32 first_offset = rbm->offset; u32 offset; u8 *buffer; - int n = 0; - int iters = rbm->rgd->rd_length; + bool wrapped = false; int ret; struct gfs2_bitmap *bi; struct gfs2_extent maxext = { .rbm.rgd = rbm->rgd, }; - /* If we are not starting at the beginning of a bitmap, then we - * need to add one to the bitmap count to ensure that we search - * the starting bitmap twice. - */ - if (rbm->offset != 0) - iters++; - while(1) { bi = rbm_bi(rbm); if ((ip == NULL || !gfs2_rs_active(&ip->i_res)) && @@ -1761,47 +1751,43 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, WARN_ON(!buffer_uptodate(bh)); if (state != GFS2_BLKST_UNLINKED && bi->bi_clone) buffer = bi->bi_clone + bi->bi_offset; - initial_offset = rbm->offset; offset = gfs2_bitfit(buffer, bi->bi_bytes, rbm->offset, state); - if (offset == BFITNOENT) - goto bitmap_full; + if (offset == BFITNOENT) { + if (state == GFS2_BLKST_FREE && rbm->offset == 0) + set_bit(GBF_FULL, &bi->bi_flags); + goto next_bitmap; + } rbm->offset = offset; if (ip == NULL) return 0; - initial_bii = rbm->bii; ret = gfs2_reservation_check_and_update(rbm, ip, minext ? *minext : 0, &maxext); if (ret == 0) return 0; - if (ret > 0) { - n += (rbm->bii - initial_bii); + if (ret > 0) goto next_iter; - } if (ret == -E2BIG) { - n += rbm->bii - initial_bii; rbm->bii = 0; rbm->offset = 0; goto res_covered_end_of_rgrp; } return ret; -bitmap_full: /* Mark bitmap as full and fall through */ - if ((state == GFS2_BLKST_FREE) && initial_offset == 0) - set_bit(GBF_FULL, &bi->bi_flags); - next_bitmap: /* Find next bitmap in the rgrp */ rbm->offset = 0; rbm->bii++; if (rbm->bii == rbm->rgd->rd_length) rbm->bii = 0; res_covered_end_of_rgrp: - if ((rbm->bii == 0) && nowrap) - break; - n++; + if (rbm->bii == 0) { + if (nowrap) + break; + wrapped = true; + } next_iter: - if (n >= iters) + if (wrapped && rbm->bii > first_bii) break; } -- 2.20.1

6 years, 7 months

3
4
0 0

[RESEND PATCH v4 1/3] fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()

by Waiman Long

The nr_dentry_unused per-cpu counter tracks dentries in both the LRU lists and the shrink lists where the DCACHE_LRU_LIST bit is set. The shrink_dcache_sb() function moves dentries from the LRU list to a shrink list and subtracts the dentry count from nr_dentry_unused. This is incorrect as the nr_dentry_unused count Will also be decremented in shrink_dentry_list() via d_shrink_del(). To fix this double decrement, the decrement in the shrink_dcache_sb() function is taken out. Fixes: 4e717f5c1083 ("list_lru: remove special case function list_lru_dispose_all." Cc: stable(a)vger.kernel.org Signed-off-by: Waiman Long <longman(a)redhat.com> Reviewed-by: Dave Chinner <dchinner(a)redhat.com> --- fs/dcache.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 2593153..44e5652 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1188,15 +1188,11 @@ static enum lru_status dentry_lru_isolate_shrink(struct list_head *item, */ void shrink_dcache_sb(struct super_block *sb) { - long freed; - do { LIST_HEAD(dispose); - freed = list_lru_walk(&sb->s_dentry_lru, + list_lru_walk(&sb->s_dentry_lru, dentry_lru_isolate_shrink, &dispose, 1024); - - this_cpu_sub(nr_dentry_unused, freed); shrink_dentry_list(&dispose); } while (list_lru_count(&sb->s_dentry_lru) > 0); } -- 1.8.3.1

6 years, 7 months

1
0
0 0

[PATCH 1/1] usb: phy: Kconfig: change FSL_USB2_OTG as tristate

by Peter Chen

It depends on USB_OTG_FSM, but USB_OTG_FSM can be module, so FSL_USB2_OTG should be tristate. It fixes below build warning: drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_ioctl': phy-fsl-usb.c:(.text+0x5e4): undefined reference to `otg_statemachine' drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_start_srp': phy-fsl-usb.c:(.text+0x680): undefined reference to `otg_statemachine' drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_host': phy-fsl-usb.c:(.text+0x800): undefined reference to `otg_statemachine' drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_start_hnp': phy-fsl-usb.c:(.text+0x88c): undefined reference to `otg_statemachine' drivers/usb/phy/phy-fsl-usb.o: In function `show_fsl_usb2_otg_state': phy-fsl-usb.c:(.text+0xa44): undefined reference to `usb_otg_state_string' drivers/usb/phy/phy-fsl-usb.o: In function `a_wait_enum': phy-fsl-usb.c:(.text+0x1718): undefined reference to `otg_statemachine' drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral': phy-fsl-usb.c:(.text+0x1f20): undefined reference to `usb_gadget_vbus_disconnect' phy-fsl-usb.c:(.text+0x1f40): undefined reference to `otg_statemachine' Cc: <stable(a)vger.kernel.org> #v4.1+ Cc: Li Yang <leoyang.li(a)nxp.com> Reported-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Peter Chen <peter.chen(a)nxp.com> --- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index d7312eed6088..5444d2437475 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY -- 2.14.1

6 years, 7 months

2
1
0 0

[PATCH] iommu/io-pgtable-arm-v7s: only kmemleak_ignore L2 tables

by Nicolas Boichat

L1 tables are allocated with __get_dma_pages, and therefore already ignored by kmemleak. Without this, the kernel would print this error message on boot, when the first L1 table is allocated: [ 2.810533] kmemleak: Trying to color unknown object at 0xffffffd652388000 as Black [ 2.818190] CPU: 5 PID: 39 Comm: kworker/5:0 Tainted: G S 4.19.16 #8 [ 2.831227] Workqueue: events deferred_probe_work_func [ 2.836353] Call trace: ... [ 2.852532] paint_ptr+0xa0/0xa8 [ 2.855750] kmemleak_ignore+0x38/0x6c [ 2.859490] __arm_v7s_alloc_table+0x168/0x1f4 [ 2.863922] arm_v7s_alloc_pgtable+0x114/0x17c [ 2.868354] alloc_io_pgtable_ops+0x3c/0x78 ... Fixes: e5fc9753b1a8314 ("iommu/io-pgtable: Add ARMv7 short descriptor support") Signed-off-by: Nicolas Boichat <drinkcat(a)chromium.org> --- I only tested this on top of my other series (https://patchwork.kernel.org/patch/10720495/), but I think the same fix applies. I'm still a bit confused as to why this only shows up now, as IIUC, the kmemleak_ignore call was always wrong with L1 tables. drivers/iommu/io-pgtable-arm-v7s.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index cec29bf45c9bd7..98a4a4a0dfb0c1 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -217,7 +217,8 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, if (dma != phys) goto out_unmap; } - kmemleak_ignore(table); + if (lvl == 2) + kmemleak_ignore(table); return table; out_unmap: -- 2.20.1.495.gaa96b0ce6b-goog

6 years, 7 months

3
2
0 0

Re: [nacked] mm-thp-always-specify-disabled-vmas-as-nh-in-smaps.patch removed from -mm tree

by Cyrill Gorcunov

On Wed, Jan 30, 2019 at 02:46:48PM +0000, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 1860033237d4 mm: make PR_SET_THP_DISABLE immediately active. > > The bot has tested the following trees: v4.20.5, v4.19.18, v4.14.96. > > v4.20.5: Build OK! > v4.19.18: Build OK! > v4.14.96: Failed to apply! Possible dependencies: > f66406638fff ("proc: replace seq_printf on seq_putc to speed up /proc/pid/smaps") > > > How should we proceed with this patch? We shouldn't. It is a false positive due to Fixes flag.

6 years, 7 months

2
1
0 0

Re: [PATCH] staging: erofs: keep corrupted fs from crashing kernel in erofs_namei()

by Gao Xiang

Hi Sasha, I will send v4.19 patch independently to the stable mailing list after It gets carefully reviewed by Chao (and Al Viro if it is possible...) Thanks, Gao Xiang On 2019/1/30 22:46, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: d72d1ce60174 staging: erofs: add namei functions. > > The bot has tested the following trees: v4.20.5, v4.19.18. > > v4.20.5: Build OK! > v4.19.18: Failed to apply! Possible dependencies: > 6e78901a9f23 ("staging: erofs: separate erofs_get_meta_page") > 7dd68b147d60 ("staging: erofs: use explicit unsigned int type") > 8be31270362b ("staging: erofs: introduce erofs_grab_bio") > ab47dd2b0819 ("staging: erofs: cleanup z_erofs_vle_work_{lookup, register}") > > > How should we proceed with this patch? > > -- > Thanks, > Sasha >

6 years, 7 months

1
0
0 0

[PATCH] staging: erofs: keep corrupted fs from crashing kernel in erofs_namei()

by Gao Xiang

As Al pointed out, " ... and while we are at it, what happens to unsigned int nameoff = le16_to_cpu(de[mid].nameoff); unsigned int matched = min(startprfx, endprfx); struct qstr dname = QSTR_INIT(data + nameoff, unlikely(mid >= ndirents - 1) ? maxsize - nameoff : le16_to_cpu(de[mid + 1].nameoff) - nameoff); /* string comparison without already matched prefix */ int ret = dirnamecmp(name, &dname, &matched); if le16_to_cpu(de[...].nameoff) is not monotonically increasing? I.e. what's to prevent e.g. (unsigned)-1 ending up in dname.len? Corrupted fs image shouldn't oops the kernel.. " Revisit the related lookup flow to address the issue. Fixes: d72d1ce60174 ("staging: erofs: add namei functions") Cc: <stable(a)vger.kernel.org> # 4.19+ Suggested-by: Al Viro <viro(a)ZenIV.linux.org.uk> Signed-off-by: Gao Xiang <gaoxiang25(a)huawei.com> --- TODO: - fix similar issue in readdir of dir.c with another patch. drivers/staging/erofs/namei.c | 167 ++++++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c index 5596c52e246d..a1300c420e63 100644 --- a/drivers/staging/erofs/namei.c +++ b/drivers/staging/erofs/namei.c @@ -15,74 +15,76 @@ #include <trace/events/erofs.h> -/* based on the value of qn->len is accurate */ -static inline int dirnamecmp(struct qstr *qn, - struct qstr *qd, unsigned int *matched) +struct erofs_qstr { + const unsigned char *name; + const unsigned char *end; +}; + +/* based on the end of qn is accurate and it must have the trailing '\0' */ +static inline int dirnamecmp(const struct erofs_qstr *qn, + const struct erofs_qstr *qd, + unsigned int *matched) { - unsigned int i = *matched, len = min(qn->len, qd->len); -loop: - if (unlikely(i >= len)) { - *matched = i; - if (qn->len < qd->len) { - /* - * actually (qn->len == qd->len) - * when qd->name[i] == '\0' - */ - return qd->name[i] == '\0' ? 0 : -1; + unsigned int i = *matched; + + /* + * on-disk error, let's only BUG_ON in the debugging mode. + * otherwise, it will return 1 to just skip the invalid name + * and go on (in consideration of the lookup performance). + */ + DBG_BUGON(qd->name > qd->end); + + /* qd could not have trailing '\0' */ + /* However it is absolutely safe if < qd->end */ + while (qd->name + i < qd->end && qd->name[i] != '\0') { + if (qn->name[i] != qd->name[i]) { + *matched = i; + return qn->name[i] > qd->name[i] ? 1 : -1; } - return (qn->len > qd->len); + ++i; } - - if (qn->name[i] != qd->name[i]) { - *matched = i; - return qn->name[i] > qd->name[i] ? 1 : -1; - } - - ++i; - goto loop; + *matched = i; + /* See comments in __d_alloc on the terminating NUL character */ + return qn->name[i] == '\0' ? 0 : 1; } -static struct erofs_dirent *find_target_dirent( - struct qstr *name, - u8 *data, int maxsize) +#define nameoff_from_disk(off, sz) (le16_to_cpu(off) & ((sz) - 1)) + +static struct erofs_dirent *find_target_dirent(struct erofs_qstr *name, + u8 *data, + unsigned int dirblksize, + const int ndirents) { - unsigned int ndirents, head, back; + int head, back; unsigned int startprfx, endprfx; struct erofs_dirent *const de = (struct erofs_dirent *)data; - /* make sure that maxsize is valid */ - BUG_ON(maxsize < sizeof(struct erofs_dirent)); - - ndirents = le16_to_cpu(de->nameoff) / sizeof(*de); - - /* corrupted dir (may be unnecessary...) */ - BUG_ON(!ndirents); - head = 0; back = ndirents - 1; startprfx = endprfx = 0; while (head <= back) { - unsigned int mid = head + (back - head) / 2; - unsigned int nameoff = le16_to_cpu(de[mid].nameoff); + const int mid = head + (back - head) / 2; + const int nameoff = nameoff_from_disk(de[mid].nameoff, + dirblksize); unsigned int matched = min(startprfx, endprfx); - - struct qstr dname = QSTR_INIT(data + nameoff, - unlikely(mid >= ndirents - 1) ? - maxsize - nameoff : - le16_to_cpu(de[mid + 1].nameoff) - nameoff); + struct erofs_qstr dname = { + .name = data + nameoff, + .end = unlikely(mid >= ndirents - 1) ? + data + dirblksize : + data + nameoff_from_disk(de[mid + 1].nameoff, + dirblksize) + }; /* string comparison without already matched prefix */ int ret = dirnamecmp(name, &dname, &matched); - if (unlikely(!ret)) + if (unlikely(!ret)) { return de + mid; - else if (ret > 0) { + } else if (ret > 0) { head = mid + 1; startprfx = matched; - } else if (unlikely(mid < 1)) /* fix "mid" overflow */ - break; - else { + } else { back = mid - 1; endprfx = matched; } @@ -91,12 +93,13 @@ static struct erofs_dirent *find_target_dirent( return ERR_PTR(-ENOENT); } -static struct page *find_target_block_classic( - struct inode *dir, - struct qstr *name, int *_diff) +static struct page *find_target_block_classic(struct inode *dir, + struct erofs_qstr *name, + int *_diff, + int *_ndirents) { unsigned int startprfx, endprfx; - unsigned int head, back; + int head, back; struct address_space *const mapping = dir->i_mapping; struct page *candidate = ERR_PTR(-ENOENT); @@ -105,33 +108,34 @@ static struct page *find_target_block_classic( back = inode_datablocks(dir) - 1; while (head <= back) { - unsigned int mid = head + (back - head) / 2; + const int mid = head + (back - head) / 2; struct page *page = read_mapping_page(mapping, mid, NULL); - if (IS_ERR(page)) { -exact_out: - if (!IS_ERR(candidate)) /* valid candidate */ - put_page(candidate); - return page; - } else { - int diff; - unsigned int ndirents, matched; - struct qstr dname; + if (!IS_ERR(page)) { struct erofs_dirent *de = kmap_atomic(page); - unsigned int nameoff = le16_to_cpu(de->nameoff); - - ndirents = nameoff / sizeof(*de); + const int nameoff = nameoff_from_disk(de->nameoff, + EROFS_BLKSIZ); + const int ndirents = nameoff / sizeof(*de); + int diff; + unsigned int matched; + struct erofs_qstr dname; - /* corrupted dir (should have one entry at least) */ - BUG_ON(!ndirents || nameoff > PAGE_SIZE); + if (unlikely(!ndirents)) { + DBG_BUGON(1); + put_page(page); + page = ERR_PTR(-EIO); + goto out; + } matched = min(startprfx, endprfx); dname.name = (u8 *)de + nameoff; - dname.len = ndirents == 1 ? - /* since the rest of the last page is 0 */ - EROFS_BLKSIZ - nameoff - : le16_to_cpu(de[1].nameoff) - nameoff; + if (ndirents == 1) + dname.end = (u8 *)de + EROFS_BLKSIZ; + else + dname.end = (u8 *)de + + nameoff_from_disk(de[1].nameoff, + EROFS_BLKSIZ); /* string comparison without already matched prefix */ diff = dirnamecmp(name, &dname, &matched); @@ -139,7 +143,7 @@ static struct page *find_target_block_classic( if (unlikely(!diff)) { *_diff = 0; - goto exact_out; + goto out; } else if (diff > 0) { head = mid + 1; startprfx = matched; @@ -147,35 +151,42 @@ static struct page *find_target_block_classic( if (likely(!IS_ERR(candidate))) put_page(candidate); candidate = page; + *_ndirents = ndirents; } else { put_page(page); - if (unlikely(mid < 1)) /* fix "mid" overflow */ - break; - back = mid - 1; endprfx = matched; } + continue; } +out: /* free if the candidate is valid */ + if (!IS_ERR(candidate)) + put_page(candidate); + return page; } *_diff = 1; return candidate; } int erofs_namei(struct inode *dir, - struct qstr *name, - erofs_nid_t *nid, unsigned int *d_type) + struct qstr *name, + erofs_nid_t *nid, unsigned int *d_type) { - int diff; + int diff, ndirents; struct page *page; u8 *data; struct erofs_dirent *de; + struct erofs_qstr qn; if (unlikely(!dir->i_size)) return -ENOENT; + qn.name = name->name; + qn.end = name->name + name->len; + diff = 1; - page = find_target_block_classic(dir, name, &diff); + page = find_target_block_classic(dir, &qn, &diff, &ndirents); if (unlikely(IS_ERR(page))) return PTR_ERR(page); @@ -184,7 +195,7 @@ int erofs_namei(struct inode *dir, /* the target page has been mapped */ de = likely(diff) ? /* since the rest of the last page is 0 */ - find_target_dirent(name, data, EROFS_BLKSIZ) : + find_target_dirent(&qn, data, EROFS_BLKSIZ, ndirents) : (struct erofs_dirent *)data; if (likely(!IS_ERR(de))) { -- 2.14.4

6 years, 7 months

2
2
0 0

patch "usb: gadget: musb: fix short isoc packets with inventra dma" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: gadget: musb: fix short isoc packets with inventra dma to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-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 c418fd6c01fbc5516a2cd1eaf1df1ec86869028a Mon Sep 17 00:00:00 2001 From: Paul Elder <paul.elder(a)ideasonboard.com> Date: Wed, 30 Jan 2019 08:13:21 -0600 Subject: usb: gadget: musb: fix short isoc packets with inventra dma Handling short packets (length < max packet size) in the Inventra DMA engine in the MUSB driver causes the MUSB DMA controller to hang. An example of a problem that is caused by this problem is when streaming video out of a UVC gadget, only the first video frame is transferred. For short packets (mode-0 or mode-1 DMA), MUSB_TXCSR_TXPKTRDY must be set manually by the driver. This was previously done in musb_g_tx (musb_gadget.c), but incorrectly (all csr flags were cleared, and only MUSB_TXCSR_MODE and MUSB_TXCSR_TXPKTRDY were set). Fixing that problem allows some requests to be transferred correctly, but multiple requests were often put together in one USB packet, and caused problems if the packet size was not a multiple of 4. Instead, set MUSB_TXCSR_TXPKTRDY in dma_controller_irq (musbhsdma.c), just like host mode transfers. This topic was originally tackled by Nicolas Boichat [0] [1] and is discussed further at [2] as part of his GSoC project [3]. [0] https://groups.google.com/forum/?hl=en#!topic/beagleboard-gsoc/k8Azwfp75CU [1] https://gitorious.org/beagleboard-usbsniffer/beagleboard-usbsniffer-kernel/… [2] http://beagleboard-usbsniffer.blogspot.com/2010/07/musb-isochronous-transfe… [3] http://elinux.org/BeagleBoard/GSoC/USBSniffer Fixes: 550a7375fe72 ("USB: Add MUSB and TUSB support") Signed-off-by: Paul Elder <paul.elder(a)ideasonboard.com> Signed-off-by: Bin Liu <b-liu(a)ti.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/musb/musb_gadget.c | 13 +------------ drivers/usb/musb/musbhsdma.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index eae8b1b1b45b..ffe462a657b1 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -452,13 +452,10 @@ void musb_g_tx(struct musb *musb, u8 epnum) } if (request) { - u8 is_dma = 0; - bool short_packet = false; trace_musb_req_tx(req); if (dma && (csr & MUSB_TXCSR_DMAENAB)) { - is_dma = 1; csr |= MUSB_TXCSR_P_WZC_BITS; csr &= ~(MUSB_TXCSR_DMAENAB | MUSB_TXCSR_P_UNDERRUN | MUSB_TXCSR_TXPKTRDY | MUSB_TXCSR_AUTOSET); @@ -476,16 +473,8 @@ void musb_g_tx(struct musb *musb, u8 epnum) */ if ((request->zero && request->length) && (request->length % musb_ep->packet_sz == 0) - && (request->actual == request->length)) - short_packet = true; + && (request->actual == request->length)) { - if ((musb_dma_inventra(musb) || musb_dma_ux500(musb)) && - (is_dma && (!dma->desired_mode || - (request->actual & - (musb_ep->packet_sz - 1))))) - short_packet = true; - - if (short_packet) { /* * On DMA completion, FIFO may not be * available yet... diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index a688f7f87829..5fc6825745f2 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -346,12 +346,10 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) channel->status = MUSB_DMA_STATUS_FREE; /* completed */ - if ((devctl & MUSB_DEVCTL_HM) - && (musb_channel->transmit) - && ((channel->desired_mode == 0) - || (channel->actual_len & - (musb_channel->max_packet_sz - 1))) - ) { + if (musb_channel->transmit && + (!channel->desired_mode || + (channel->actual_len % + musb_channel->max_packet_sz))) { u8 epnum = musb_channel->epnum; int offset = musb->io.ep_offset(epnum, MUSB_TXCSR); @@ -363,11 +361,14 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) */ musb_ep_select(mbase, epnum); txcsr = musb_readw(mbase, offset); - txcsr &= ~(MUSB_TXCSR_DMAENAB + if (channel->desired_mode == 1) { + txcsr &= ~(MUSB_TXCSR_DMAENAB | MUSB_TXCSR_AUTOSET); - musb_writew(mbase, offset, txcsr); - /* Send out the packet */ - txcsr &= ~MUSB_TXCSR_DMAMODE; + musb_writew(mbase, offset, txcsr); + /* Send out the packet */ + txcsr &= ~MUSB_TXCSR_DMAMODE; + txcsr |= MUSB_TXCSR_DMAENAB; + } txcsr |= MUSB_TXCSR_TXPKTRDY; musb_writew(mbase, offset, txcsr); } -- 2.20.1

6 years, 7 months

1
0
0 0

Re: [PATCH] mac80211: ensure that mgmt tx skbs have tailroom for encryption

by Sasha Levin

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: all The bot has tested the following trees: v4.20.5, v4.19.18, v4.14.96, v4.9.153, v4.4.172, v3.18.133. v4.20.5: Build OK! v4.19.18: Build OK! v4.14.96: Build OK! v4.9.153: Build OK! v4.4.172: Build OK! v3.18.133: Failed to apply! Possible dependencies: 057fcd426e14 ("bcma: gpio: use predictable base for all BCM47XX buses") 077efc8c42e8 ("ath10k: clean up sta auth/assoc code") 202e86e60646 ("ath10k: add ATH10K_FW_IE_WMI_OP_VERSION") 292a753d4b18 ("ath10k: clean up num_peers locking") 30686bf7f5b3 ("mac80211: convert HW flags to unsigned long bitmap") 34b28b6e9a66 ("ath10k: print wmi version info") 3c7984e97f32 ("ath10k: don't create bssid peer for ibss") 3cb10943fc60 ("ath10k: use IEEE80211_HW_SW_CRYPTO_CONTROL") 41fbf6e4f317 ("ath10k: enable IEEE80211_HW_SUPPORT_FAST_XMIT") 5f2144d9b2ea ("ath10k: create ath10k_core_init_features()") 830915597747 ("ath10k: refactor ath10k_init_download_firmware()") 84cbf3a75928 ("ath10k: split ce pipe init/alloc further") a52c0282721e ("ath10k: add missing goto") a58227ef69a7 ("ath10k: retrieve calibration data from file") c6ce492d03e8 ("ath10k: clean up error handling in ath10k_core_probe_fw()") ca996ec56608 ("ath10k: implement wmi-tlv backend") cfd1061e9b52 ("ath10k: fix station count enforcement") d63955b33b3b ("ath10k: add support for qca6174") d98c3edcbbbf ("Merge tag 'wireless-drivers-next-for-davem-2015-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next") How should we proceed with this patch? -- Thanks, Sasha

6 years, 7 months

1
0
0 0

patch "samples: mei: use /dev/mei0 instead of /dev/mei" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled samples: mei: use /dev/mei0 instead of /dev/mei to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-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 c4a46acf1db3ce547d290c29e55b3476c78dd76c Mon Sep 17 00:00:00 2001 From: Tomas Winkler <tomas.winkler(a)intel.com> Date: Thu, 24 Jan 2019 14:45:03 +0200 Subject: samples: mei: use /dev/mei0 instead of /dev/mei The device was moved from misc device to character devices to support multiple mei devices. Cc: <stable(a)vger.kernel.org> #v4.9+ Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- samples/mei/mei-amt-version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/mei/mei-amt-version.c b/samples/mei/mei-amt-version.c index 33e67bd1dc34..32234481ad7d 100644 --- a/samples/mei/mei-amt-version.c +++ b/samples/mei/mei-amt-version.c @@ -117,7 +117,7 @@ static bool mei_init(struct mei *me, const uuid_le *guid, me->verbose = verbose; - me->fd = open("/dev/mei", O_RDWR); + me->fd = open("/dev/mei0", O_RDWR); if (me->fd == -1) { mei_err(me, "Cannot establish a handle to the Intel MEI driver\n"); goto err; -- 2.20.1

6 years, 7 months

1
0
0 0

patch "mei: me: add ice lake point device id." added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled mei: me: add ice lake point device id. to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-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 efe814e90b98aed6d655b5a4092b9114b8b26e42 Mon Sep 17 00:00:00 2001 From: Tomas Winkler <tomas.winkler(a)intel.com> Date: Thu, 24 Jan 2019 14:45:02 +0200 Subject: mei: me: add ice lake point device id. Add icelake mei device id. Cc: <stable(a)vger.kernel.org> Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 23739a60517f..bb1ee9834a02 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -139,6 +139,8 @@ #define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */ #define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */ +#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */ + /* * MEI HW Section */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index e89497f858ae..3ab946ad3257 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -105,6 +105,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + /* required last entry */ {0, } }; -- 2.20.1

6 years, 7 months

1
0
0 0

[PATCH] mfd: Fix I2C_DESIGNWARE_PLATFORM dependencies

by Jarkko Nikula

INTEL_SOC_PMIC, INTEL_SOC_PMIC_CHTWC and MFD_TPS68470 select the I2C_DESIGNWARE_PLATFORM without its dependencies making it possible to see warning and build error like below: WARNING: unmet direct dependencies detected for I2C_DESIGNWARE_PLATFORM Depends on [n]: I2C [=y] && HAS_IOMEM [=y] && (ACPI [=y] && COMMON_CLK [=n] || !ACPI [=y]) Selected by [y]: - MFD_TPS68470 [=y] && HAS_IOMEM [=y] && ACPI [=y] && I2C [=y]=y /usr/bin/ld: drivers/i2c/busses/i2c-designware-platdrv.o: in function `dw_i2c_plat_resume': i2c-designware-platdrv.c:(.text+0x62): undefined reference to `i2c_dw_prepare_clk' /usr/bin/ld: drivers/i2c/busses/i2c-designware-platdrv.o: in function `dw_i2c_plat_suspend': i2c-designware-platdrv.c:(.text+0x9a): undefined reference to `i2c_dw_prepare_clk' /usr/bin/ld: drivers/i2c/busses/i2c-designware-platdrv.o: in function `dw_i2c_plat_probe': i2c-designware-platdrv.c:(.text+0x41c): undefined reference to `i2c_dw_prepare_clk' /usr/bin/ld: i2c-designware-platdrv.c:(.text+0x438): undefined reference to `i2c_dw_read_comp_param' /usr/bin/ld: i2c-designware-platdrv.c:(.text+0x545): undefined reference to `i2c_dw_probe' /usr/bin/ld: i2c-designware-platdrv.c:(.text+0x727): undefined reference to `i2c_dw_probe_slave' Fix this by making above options to depend on I2C_DESIGNWARE_PLATFORM being built-in. I2C_DESIGNWARE_PLATFORM is a visible symbol with dependencies so in general the select should be avoided. Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Fixes: acebcff9eda8 ("mfd: intel_soc_pmic: Select designware i2c-bus driver") Fixes: de85d79f4aab ("mfd: Add Cherry Trail Whiskey Cove PMIC driver") Fixes: 9bbf6a15ce19 ("mfd: Add support for TPS68470 device") Cc: Stable <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- drivers/mfd/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index f461460a2aeb..6a84a8ecd4a9 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -519,10 +519,10 @@ config INTEL_SOC_PMIC bool "Support for Crystal Cove PMIC" depends on ACPI && HAS_IOMEM && I2C=y && GPIOLIB && COMMON_CLK depends on X86 || COMPILE_TEST + depends on I2C_DESIGNWARE_PLATFORM=y select MFD_CORE select REGMAP_I2C select REGMAP_IRQ - select I2C_DESIGNWARE_PLATFORM help Select this option to enable support for Crystal Cove PMIC on some Intel SoC systems. The PMIC provides ADC, GPIO, @@ -548,10 +548,10 @@ config INTEL_SOC_PMIC_CHTWC bool "Support for Intel Cherry Trail Whiskey Cove PMIC" depends on ACPI && HAS_IOMEM && I2C=y && COMMON_CLK depends on X86 || COMPILE_TEST + depends on I2C_DESIGNWARE_PLATFORM=y select MFD_CORE select REGMAP_I2C select REGMAP_IRQ - select I2C_DESIGNWARE_PLATFORM help Select this option to enable support for the Intel Cherry Trail Whiskey Cove PMIC found on some Intel Cherry Trail systems. @@ -1420,9 +1420,9 @@ config MFD_TPS65217 config MFD_TPS68470 bool "TI TPS68470 Power Management / LED chips" depends on ACPI && I2C=y + depends on I2C_DESIGNWARE_PLATFORM=y select MFD_CORE select REGMAP_I2C - select I2C_DESIGNWARE_PLATFORM help If you say yes here you get support for the TPS68470 series of Power Management / LED chips. -- 2.20.1

6 years, 7 months

3
2
0 0

patch "staging: speakup: fix tty-operation NULL derefs" added to tty-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: speakup: fix tty-operation NULL derefs 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 a1960e0f1639cb1f7a3d94521760fc73091f6640 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan(a)kernel.org> Date: Wed, 30 Jan 2019 10:49:34 +0100 Subject: staging: speakup: fix tty-operation NULL derefs The send_xchar() and tiocmset() tty operations are optional. Add the missing sanity checks to prevent user-space triggerable NULL-pointer dereferences. Fixes: 6b9ad1c742bf ("staging: speakup: add send_xchar, tiocmset and input functionality for tty") Cc: stable <stable(a)vger.kernel.org> # 4.13 Cc: Okash Khawaja <okash.khawaja(a)gmail.com> Cc: Samuel Thibault <samuel.thibault(a)ens-lyon.org> Signed-off-by: Johan Hovold <johan(a)kernel.org> Reviewed-by: Samuel Thibault <samuel.thibault(a)ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/speakup/spk_ttyio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c index c92bbd05516e..005de0024dd4 100644 --- a/drivers/staging/speakup/spk_ttyio.c +++ b/drivers/staging/speakup/spk_ttyio.c @@ -265,7 +265,8 @@ static void spk_ttyio_send_xchar(char ch) return; } - speakup_tty->ops->send_xchar(speakup_tty, ch); + if (speakup_tty->ops->send_xchar) + speakup_tty->ops->send_xchar(speakup_tty, ch); mutex_unlock(&speakup_tty_mutex); } @@ -277,7 +278,8 @@ static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear) return; } - speakup_tty->ops->tiocmset(speakup_tty, set, clear); + if (speakup_tty->ops->tiocmset) + speakup_tty->ops->tiocmset(speakup_tty, set, clear); mutex_unlock(&speakup_tty_mutex); } -- 2.20.1

6 years, 7 months

1
0
0 0

[PATCH] Revert "drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines"

by Alex Deucher

This reverts commit 10117450735c7a7c0858095fb46a860e7037cb9a. Causes a crash. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=109487 Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org # 4.19 --- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/calcs/Makefile b/drivers/gpu/drm/amd/display/dc/calcs/Makefile index dc85a3c088af..95f332ee3e7e 100644 --- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile +++ b/drivers/gpu/drm/amd/display/dc/calcs/Makefile @@ -30,7 +30,7 @@ else ifneq ($(call cc-option, -mstack-alignment=16),) cc_stack_align := -mstack-alignment=16 endif -calcs_ccflags := -mhard-float -msse -msse2 $(cc_stack_align) +calcs_ccflags := -mhard-float -msse $(cc_stack_align) CFLAGS_dcn_calcs.o := $(calcs_ccflags) CFLAGS_dcn_calc_auto.o := $(calcs_ccflags) diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile index 33c7d7588712..d97ca6528f9d 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -30,7 +30,7 @@ else ifneq ($(call cc-option, -mstack-alignment=16),) cc_stack_align := -mstack-alignment=16 endif -dml_ccflags := -mhard-float -msse -msse2 $(cc_stack_align) +dml_ccflags := -mhard-float -msse $(cc_stack_align) CFLAGS_display_mode_lib.o := $(dml_ccflags) CFLAGS_display_pipe_clocks.o := $(dml_ccflags) -- 2.20.1

6 years, 7 months

4
4
0 0

[PATCH] staging: speakup: fix tty-operation NULL derefs

by Johan Hovold

The send_xchar() and tiocmset() tty operations are optional. Add the missing sanity checks to prevent user-space triggerable NULL-pointer dereferences. Fixes: 6b9ad1c742bf ("staging: speakup: add send_xchar, tiocmset and input functionality for tty") Cc: stable <stable(a)vger.kernel.org> # 4.13 Cc: Okash Khawaja <okash.khawaja(a)gmail.com> Cc: Samuel Thibault <samuel.thibault(a)ens-lyon.org> Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/staging/speakup/spk_ttyio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c index c92bbd05516e..005de0024dd4 100644 --- a/drivers/staging/speakup/spk_ttyio.c +++ b/drivers/staging/speakup/spk_ttyio.c @@ -265,7 +265,8 @@ static void spk_ttyio_send_xchar(char ch) return; } - speakup_tty->ops->send_xchar(speakup_tty, ch); + if (speakup_tty->ops->send_xchar) + speakup_tty->ops->send_xchar(speakup_tty, ch); mutex_unlock(&speakup_tty_mutex); } @@ -277,7 +278,8 @@ static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear) return; } - speakup_tty->ops->tiocmset(speakup_tty, set, clear); + if (speakup_tty->ops->tiocmset) + speakup_tty->ops->tiocmset(speakup_tty, set, clear); mutex_unlock(&speakup_tty_mutex); } -- 2.20.1

6 years, 7 months

2
1
0 0

Stable queue: queue-4.20

by CKI

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 9f1a389a0b5b Linux 4.20.5 The results of these automated tests are provided below. Overall result: FAILED (see details below) Patch merge: OK Compile: OK Kernel tests: FAILED One or more kernel tests failed: aarch64: PASSED s390x: PASSED powerpc64le: PASSED x86_64: PASSED We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: 9f1a389a0b5b Linux 4.20.5 We then merged the following patches with `git am`: amd-xgbe-fix-mdio-access-for-non-zero-ports-and-clause-45-phys.patch net-bridge-fix-ethernet-header-pointer-before-check-skb-forwardable.patch net-fix-usage-of-pskb_trim_rcsum.patch net-phy-marvell-errata-for-mv88e6390-internal-phys.patch net-phy-mdio_bus-add-missing-device_del-in-mdiobus_register-error-handling.patch net-phy-phy-driver-features-are-mandatory.patch net-sched-act_tunnel_key-fix-memory-leak-in-case-of-action-replace.patch net_sched-refetch-skb-protocol-for-each-filter.patch openvswitch-avoid-oob-read-when-parsing-flow-nlattrs.patch vhost-log-dirty-page-correctly.patch mlxsw-pci-increase-pci-sw-reset-timeout.patch net-ipv4-fix-memory-leak-in-network-namespace-dismantle.patch mlxsw-spectrum_fid-update-dummy-fid-index.patch mlxsw-pci-ring-cq-s-doorbell-before-rdq-s.patch net-sched-cls_flower-allocate-mask-dynamically-in-fl_change.patch udp-with-udp_segment-release-on-error-path.patch ip6_gre-fix-tunnel-list-corruption-for-x-netns.patch erspan-build-the-header-with-the-right-proto-according-to-erspan_ver.patch net-phy-marvell-fix-deadlock-from-wrong-locking.patch ip6_gre-update-version-related-info-when-changing-link.patch tcp-allow-msg_zerocopy-transmission-also-in-close_wait-state.patch arm-fix-the-cockup-in-the-previous-patch.patch sunrpc-address-kerberos-performance-behavior-regress.patch mei-me-mark-lbg-devices-as-having-dma-support.patch mei-me-add-denverton-innovation-engine-device-ids.patch usb-leds-fix-regression-in-usbport-led-trigger.patch usb-ehci-ehci-mv-add-module_device_table.patch usb-serial-ftdi_sio-fix-gpio-not-working-in-autosuspend.patch usb-serial-simple-add-motorola-tetra-tpg2200-device-id.patch usb-serial-pl2303-add-new-pid-to-support-pl2303tb.patch ceph-clear-inode-pointer-when-snap-realm-gets-dropped-by-its-inode.patch asoc-atom-fix-a-missing-check-of-snd_pcm_lib_malloc_pages.patch asoc-rt5514-spi-fix-potential-null-pointer-dereference.patch asoc-tlv320aic32x4-kernel-oops-while-entering-dapm-standby-mode.patch clk-zynqmp-fix-memory-allocation-in-zynqmp_clk_setup.patch clk-socfpga-stratix10-fix-rate-calculation-for-pll-clocks.patch clk-socfpga-stratix10-fix-naming-convention-for-the-fixed-clocks.patch inotify-fix-fd-refcount-leak-in-inotify_add_watch.patch alsa-hda-realtek-fix-typo-for-alc225-model.patch alsa-hda-add-mute-led-support-for-hp-probook-470-g5.patch arcv2-lib-memeset-fix-doing-prefetchw-outside-of-buffer.patch arc-adjust-memblock_reserve-of-kernel-memory.patch arc-perf-map-generic-branches-to-correct-hardware-condition.patch s390-vdso-correct-vdso-mapping-for-compat-tasks.patch s390-mm-always-force-a-load-of-the-primary-asce-on-context-switch.patch s390-early-improve-machine-detection.patch s390-smp-fix-cpu-hotplug-deadlock-with-cpu-rescan.patch s390-smp-fix-calling-smp_call_ipl_cpu-from-ipl-cpu.patch misc-ibmvsm-fix-potential-null-pointer-dereference.patch char-mwave-fix-potential-spectre-v1-vulnerability.patch mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch mmc-dw_mmc-bluefield-fix-the-license-information.patch mmc-meson-gx-free-irq-in-release-callback.patch staging-rtl8188eu-add-device-code-for-d-link-dwa-121-rev-b1.patch tty-handle-problem-if-line-discipline-does-not-have-receive_buf.patch uart-fix-crash-in-uart_write-and-uart_put_char.patch tty-n_hdlc-fix-__might_sleep-warning.patch hv_balloon-avoid-touching-uninitialized-struct-page-during-tail-onlining.patch drivers-hv-vmbus-check-for-ring-when-getting-debug-info.patch vgacon-unconfuse-vc_origin-when-using-soft-scrollback.patch cifs-fix-possible-hang-during-async-mtu-reads-and-writes.patch cifs-fix-credits-calculations-for-reads-with-errors.patch cifs-fix-credit-calculation-for-encrypted-reads-with-errors.patch cifs-do-not-reconnect-tcp-session-in-add_credits.patch smb3-add-credits-we-receive-from-oplock-break-pdus.patch input-xpad-add-support-for-steelseries-stratus-duo.patch input-input_event-provide-override-for-sparc64.patch input-uinput-fix-undefined-behavior-in-uinput_validate_absinfo.patch acpi-nfit-block-function-zero-dsms.patch acpi-nfit-fix-command-supported-detection.patch scsi-ufs-use-explicit-access-size-in-ufshcd_dump_regs.patch dm-thin-fix-passdown_double_checking_shared_status.patch dm-crypt-fix-parsing-of-extended-iv-arguments.patch drm-amdgpu-add-aptx-quirk-for-lenovo-laptop.patch edac-altera-fix-s10-persistent-register-offset.patch kvm-x86-fix-single-step-debugging.patch kvm-x86-fix-pv-ipis-for-32-bit-kvm-host.patch kvm-x86-warn_once-if-sending-a-pv-ipi-returns-a-fatal-error.patch kvm-x86-vmx-use-kzalloc-for-cached_vmcs12.patch x86-pkeys-properly-copy-pkey-state-at-fork.patch x86-selftests-pkeys-fork-to-check-for-state-being-preserved.patch x86-kaslr-fix-incorrect-i8254-outb-parameters.patch x86-entry-64-compat-fix-stack-switching-for-xen-pv.patch posix-cpu-timers-unbreak-timer-rearming.patch net-sun-cassini-cleanup-license-conflict.patch irqchip-gic-v3-its-align-pci-multi-msi-allocation-on-their-size.patch can-dev-__can_get_echo_skb-fix-bogous-check-for-non-existing-skb-by-removing-it.patch can-bcm-check-timer-values-before-ktime-conversion.patch can-flexcan-fix-null-pointer-exception-during-bringup.patch vt-make-vt_console_print-compatible-with-the-unicode-screen-buffer.patch vt-always-call-notifier-with-the-console-lock-held.patch vt-invoke-notifier-on-screen-size-change.patch drm-meson-fix-atomic-mode-switching-regression.patch bpf-move-prev_-insn_idx-into-verifier-env.patch bpf-move-tmp-variable-into-ax-register-in-interprete.patch nvmet-rdma-add-unlikely-for-response-allocated-check.patch nvmet-rdma-fix-null-dereference-under-heavy-load.patch bpf-enable-access-to-ax-register-also-from-verifier-.patch bpf-restrict-map-value-pointer-arithmetic-for-unpriv.patch bpf-restrict-stack-pointer-arithmetic-for-unprivileg.patch bpf-restrict-unknown-scalars-of-mixed-signed-bounds-.patch bpf-fix-check_map_access-smin_value-test-when-pointe.patch bpf-prevent-out-of-bounds-speculation-on-pointer-ari.patch bpf-fix-sanitation-of-alu-op-with-pointer-scalar-typ.patch bpf-fix-inner-map-masking-to-prevent-oob-under-specu.patch drivers-hv-vmbus-remove-the-useless-api-vmbus_get_ou.patch vmbus-fix-subchannel-removal.patch revert-mm-memory_hotplug-initialize-struct-pages-for-the-full-memory-section.patch usb-dwc3-gadget-clear-req-needs_extra_trb-flag-on-cleanup.patch mt76x0-do-not-overwrite-other-mt_bbp-agc-8-fields.patch mt76x0-use-band-parameter-for-lc-calibration.patch mt76x02-run-calibration-after-scanning.patch mt76x02-assure-we-update-gain-after-scan.patch mt76x0-do-not-perform-mcu-calibration-for-mt7630.patch mt76x0-antenna-select-corrections.patch mt76x0-phy-unify-calibration-between-mt76x0u-and-mt76x0e.patch ide-fix-a-typo-in-the-settings-proc-file-name.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/f69dc101d09505361cf9397fb4… s390x: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/s390x/1233ae6f1231470c40d701bb96bf… powerpc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/5fb4530fd36d52d329930dd56c… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/26643eb24ea65bdb5be58f873a6… Hardware testing ---------------- We booted each kernel and ran the following tests: arm64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… s390: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu powerpc: x86_64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

6 years, 7 months

3
2
0 0

patch "serial: sh-sci: Do not free irqs that have already been freed" added to tty-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: sh-sci: Do not free irqs that have already been freed 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 4d95987a32db53f3beca76f8c4c8309ef6a5f192 Mon Sep 17 00:00:00 2001 From: Chris Brandt <chris.brandt(a)renesas.com> Date: Mon, 28 Jan 2019 13:25:56 -0500 Subject: serial: sh-sci: Do not free irqs that have already been freed Since IRQs might be muxed on some parts, we need to pay attention when we are freeing them. Otherwise we get the ugly WARNING "Trying to free already-free IRQ 20". Fixes: 628c534ae735 ("serial: sh-sci: Improve support for separate TEI and DRI interrupts") Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Chris Brandt <chris.brandt(a)renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/sh-sci.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 8df0fd824520..64bbeb7d7e0c 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1921,7 +1921,7 @@ static int sci_request_irq(struct sci_port *port) static void sci_free_irq(struct sci_port *port) { - int i; + int i, j; /* * Intentionally in reverse order so we iterate over the muxed @@ -1937,6 +1937,13 @@ static void sci_free_irq(struct sci_port *port) if (unlikely(irq < 0)) continue; + /* Check if already freed (irq was muxed) */ + for (j = 0; j < i; j++) + if (port->irqs[j] == irq) + j = i + 1; + if (j > i) + continue; + free_irq(port->irqs[i], port); kfree(port->irqstr[i]); -- 2.20.1

6 years, 7 months

1
0
0 0

patch "serial: 8250_pci: Make PCI class test non fatal" added to tty-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: 8250_pci: Make PCI class test non fatal 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 824d17c57b0abbcb9128fb3f7327fae14761914b Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Date: Thu, 24 Jan 2019 23:51:21 +0200 Subject: serial: 8250_pci: Make PCI class test non fatal As has been reported the National Instruments serial cards have broken PCI class. The commit 7d8905d06405 ("serial: 8250_pci: Enable device after we check black list") made the PCI class check mandatory for the case when device is listed in a quirk list. Make PCI class test non fatal to allow broken card be enumerated. Fixes: 7d8905d06405 ("serial: 8250_pci: Enable device after we check black list") Cc: stable <stable(a)vger.kernel.org> Reported-by: Guan Yung Tseng <guan.yung.tseng(a)ni.com> Tested-by: Guan Yung Tseng <guan.yung.tseng(a)ni.com> Tested-by: KHUENY.Gerhard <Gerhard.KHUENY(a)bachmann.info> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/8250/8250_pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index f80a300b5d68..48bd694a5fa1 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -3420,6 +3420,11 @@ static int serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board) { int num_iomem, num_port, first_port = -1, i; + int rc; + + rc = serial_pci_is_class_communication(dev); + if (rc) + return rc; /* * Should we try to make guesses for multiport serial devices later? @@ -3647,10 +3652,6 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent) board = &pci_boards[ent->driver_data]; - rc = serial_pci_is_class_communication(dev); - if (rc) - return rc; - rc = serial_pci_is_blacklisted(dev); if (rc) return rc; -- 2.20.1

6 years, 7 months

1
0
0 0

[PATCH 4.4 000/104] 4.4.172-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.172 release. There are 104 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 Sat Jan 26 19:01:09 UTC 2019. 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.4.172-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.4.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.4.172-rc1 Corey Minyard <cminyard(a)mvista.com> ipmi:ssif: Fix handling of multi-part return messages Eric Dumazet <edumazet(a)google.com> net: speed up skb_rbtree_purge() Michal Hocko <mhocko(a)suse.com> mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps Brian Foster <bfoster(a)redhat.com> mm/page-writeback.c: don't break integrity writeback on ->writepage() error Junxiao Bi <junxiao.bi(a)oracle.com> ocfs2: fix panic due to unrecovered local alloc Qian Cai <cai(a)lca.pw> scsi: megaraid: fix out-of-bound array accesses Daniel Vetter <daniel.vetter(a)ffwll.ch> sysfs: Disable lockdep for driver bind/unbind files Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: bebob: fix model-id of unit for Apogee Ensemble Nikos Tsironis <ntsironis(a)arrikto.com> dm snapshot: Fix excessive memory usage and workqueue stalls Nikos Tsironis <ntsironis(a)arrikto.com> dm kcopyd: Fix bug causing workqueue stalls Arnaldo Carvalho de Melo <acme(a)redhat.com> perf parse-events: Fix unchecked usage of strncpy() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf svghelper: Fix unchecked usage of strncpy() Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix error with config term "pt=0" Jonas Danielsson <jonas(a)orbital-systems.com> mmc: atmel-mci: do not assume idle after atmci_request_end Masahiro Yamada <yamada.masahiro(a)socionext.com> kconfig: fix memory leak when EOF is encountered in quotation Masahiro Yamada <yamada.masahiro(a)socionext.com> kconfig: fix file name and line number of warn_ignored_character() Lucas Stach <l.stach(a)pengutronix.de> clk: imx6q: reset exclusive gates on init David Disseldorp <ddiss(a)suse.de> scsi: target: use consistent left-aligned ASCII INQUIRY data yupeng <yupeng0921(a)gmail.com> net: call sk_dst_reset when set SO_DONTROUTE Nathan Chancellor <natechancellor(a)gmail.com> media: firewire: Fix app_info parameter type in avc_ca{,_app}_info Breno Leitao <leitao(a)debian.org> powerpc/pseries/cpuidle: Fix preempt warning Joel Fernandes (Google) <joel(a)joelfernandes.org> pstore/ram: Do not treat empty buffers as valid Daniel Santos <daniel.santos(a)pobox.com> jffs2: Fix use of uninitialized delayed_work, lockdep breakage Anders Roxell <anders.roxell(a)linaro.org> arm64: perf: set suppress_bind_attrs flag to true Maciej W. Rozycki <macro(a)linux-mips.org> MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur Anders Roxell <anders.roxell(a)linaro.org> writeback: don't decrement wb->refcnt if !wb->bdi Miroslav Lichvar <mlichvar(a)redhat.com> e1000e: allow non-monotonic SYSTIM readings João Paulo Rechi Vita <jprvita(a)gmail.com> platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey Darrick J. Wong <darrick.wong(a)oracle.com> xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE David Ahern <dsahern(a)gmail.com> ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses David Ahern <dsahern(a)gmail.com> ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address Kai-Heng Feng <kai.heng.feng(a)canonical.com> r8169: Add support for new Realtek Ethernet Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> media: vb2: be sure to unlock mutex on errors Ivan Mironov <mironov.ivan(a)gmail.com> drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl() Jan Kara <jack(a)suse.cz> loop: Get rid of loop_index_mutex Jan Kara <jack(a)suse.cz> loop: Fold __loop_release into loop_release Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> block/loop: Use global lock for ioctl() operation. Ying Xue <ying.xue(a)windriver.com> tipc: fix uninit-value in tipc_nl_compat_doit Ying Xue <ying.xue(a)windriver.com> tipc: fix uninit-value in tipc_nl_compat_name_table_dump Ying Xue <ying.xue(a)windriver.com> tipc: fix uninit-value in tipc_nl_compat_link_set Ying Xue <ying.xue(a)windriver.com> tipc: fix uninit-value in tipc_nl_compat_bearer_enable Ying Xue <ying.xue(a)windriver.com> tipc: fix uninit-value in tipc_nl_compat_link_reset_stats Xin Long <lucien.xin(a)gmail.com> sctp: allocate sctp_sockaddr_entry with kzalloc Stephen Smalley <sds(a)tycho.nsa.gov> selinux: fix GPF on invalid policy J. Bruce Fields <bfields(a)redhat.com> sunrpc: handle ENOMEM in rpcb_getport_async Hans Verkuil <hverkuil(a)xs4all.nl> media: vb2: vb2_mmap: move lock up James Morris <james.morris(a)microsoft.com> LSM: Check for NULL cred-security on free Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vivid: set min width/height to a value > 0 Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vivid: fix error handling of kthread_run Vlad Tsyrklevich <vlad(a)tsyrklevich.net> omap2fb: Fix stack memory disclosure YunQiang Su <ysu(a)wavecomp.com> Disable MSI also when pcie-octeon.pcie_disable on Jonathan Hunter <jonathanh(a)nvidia.com> mfd: tps6586x: Handle interrupts on suspend Arnd Bergmann <arnd(a)arndb.de> mips: fix n32 compat_ipc_parse_version Ivan Mironov <mironov.ivan(a)gmail.com> scsi: sd: Fix cache_type_store() Kees Cook <keescook(a)chromium.org> Yama: Check for pid death before checking ancestry Josef Bacik <josef(a)toxicpanda.com> btrfs: wait on ordered extents on abort cleanup Eric Biggers <ebiggers(a)google.com> crypto: authenc - fix parsing key with misaligned rta_len Harsh Jain <harsh(a)chelsio.com> crypto: authencesn - Avoid twice completion call in decrypt path Willem de Bruijn <willemb(a)google.com> ip: on queued skb use skb_header_pointer instead of pskb_may_pull Jason Gunthorpe <jgg(a)mellanox.com> packet: Do not leak dev refcounts on error exit JianJhen Chen <kchen(a)synology.com> net: bridge: fix a bug on using a neighbour cache entry without checking its state Eric Dumazet <edumazet(a)google.com> ipv6: fix kernel-infoleak in ipv6_local_error() Mark Rutland <mark.rutland(a)arm.com> arm64: Don't trap host pointer auth use to EL2 Mark Rutland <mark.rutland(a)arm.com> arm64/kvm: consistently handle host HCR_EL2 flags Gwendal Grignou <gwendal(a)chromium.org> proc: Remove empty line in /proc/self/status Ben Hutchings <ben(a)decadent.org.uk> media: em28xx: Fix misplaced reset of dev->v4l::field_count Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> f2fs: fix validation of the block count in sanity_check_raw_super Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: fix missing up_read Chao Yu <yuchao0(a)huawei.com> f2fs: fix invalid memory access Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with cp_pack_start_sum Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with block address in main area v2 Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with block address in main area Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with reserved blkaddr of inline inode Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with node footer and iblocks Ben Hutchings <ben.hutchings(a)codethink.co.uk> f2fs: Add sanity_check_inode() function Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with user_block_count Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with secs_per_zone Chao Yu <yuchao0(a)huawei.com> f2fs: introduce and spread verify_blkaddr Chao Yu <yuchao0(a)huawei.com> f2fs: clean up with is_valid_blkaddr() Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: enhance sanity_check_raw_super() to avoid potential overflow Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: sanity check on sit entry Yunlei He <heyunlei(a)huawei.com> f2fs: check blkaddr more accuratly before issue a bio Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: return error during fill_super Chao Yu <yuchao0(a)huawei.com> f2fs: fix race condition in between free nid allocator/initializer Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: free meta pages if sanity check for ckpt is failed Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: detect wrong layout Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: put directory inodes before checkpoint in roll-forward recovery Tiezhu Yang <kernelpatch(a)126.com> f2fs: introduce get_checkpoint_version for cleanup Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: use crc and cp version to determine roll-forward recovery Chao Yu <yuchao0(a)huawei.com> f2fs: avoid unneeded loop in build_sit_entries Yunlei He <heyunlei(a)huawei.com> f2fs: not allow to write illegal blkaddr Chao Yu <yuchao0(a)huawei.com> f2fs: fix to avoid reading out encrypted data in page cache Chao Yu <yuchao0(a)huawei.com> f2fs: fix inode cache leak Chao Yu <yuchao0(a)huawei.com> f2fs: factor out fsync inode entry operations Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: remove an obsolete variable Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: give -EINVAL for norecovery and rw mount Chao Yu <chao2.yu(a)samsung.com> f2fs: fix to convert inline directory correctly Shawn Lin <shawn.lin(a)rock-chips.com> f2fs: move sanity checking of cp into get_valid_checkpoint Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: cover more area with nat_tree_lock Chao Yu <chao2.yu(a)samsung.com> f2fs: clean up argument of recover_data Oliver Hartkopp <socketcan(a)hartkopp.net> can: gw: ensure DLC boundaries after CAN frame modification Dmitry Safonov <dima(a)arista.com> tty/ldsem: Wake up readers after timed out down_write() ------------- Diffstat: Documentation/filesystems/proc.txt | 4 +- Makefile | 4 +- arch/arm64/include/asm/kvm_arm.h | 3 + arch/arm64/kernel/head.S | 3 +- arch/arm64/kernel/perf_event.c | 1 + arch/arm64/kvm/hyp.S | 2 +- arch/mips/Kconfig | 4 + arch/mips/pci/msi-octeon.c | 4 +- arch/mips/sibyte/common/Makefile | 1 + arch/mips/sibyte/common/dma.c | 14 ++ crypto/authenc.c | 14 +- crypto/authencesn.c | 2 +- drivers/base/bus.c | 7 +- drivers/block/loop.c | 79 +++++------ drivers/block/loop.h | 1 - drivers/char/ipmi/ipmi_ssif.c | 25 ++-- drivers/clk/imx/clk-imx6q.c | 6 +- drivers/cpuidle/cpuidle-pseries.c | 8 +- drivers/gpu/drm/drm_fb_helper.c | 7 +- drivers/md/dm-kcopyd.c | 19 ++- drivers/md/dm-snap.c | 22 +++ drivers/media/firewire/firedtv-avc.c | 6 +- drivers/media/firewire/firedtv.h | 6 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 5 +- drivers/media/platform/vivid/vivid-kthread-out.c | 5 +- drivers/media/platform/vivid/vivid-vid-common.c | 2 +- drivers/media/usb/em28xx/em28xx-video.c | 4 +- drivers/media/v4l2-core/videobuf2-core.c | 14 +- drivers/mfd/tps6586x.c | 24 ++++ drivers/mmc/host/atmel-mci.c | 3 +- drivers/net/ethernet/intel/e1000e/ptp.c | 13 +- drivers/net/ethernet/realtek/r8169.c | 2 + drivers/platform/x86/asus-wmi.c | 3 +- drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- drivers/scsi/sd.c | 6 + drivers/target/target_core_spc.c | 17 ++- drivers/tty/tty_ldsem.c | 10 ++ drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 + fs/btrfs/disk-io.c | 8 ++ fs/f2fs/checkpoint.c | 168 ++++++++++++----------- fs/f2fs/data.c | 118 ++++++++++------ fs/f2fs/dir.c | 87 ++++++------ fs/f2fs/f2fs.h | 77 ++++++++--- fs/f2fs/file.c | 21 ++- fs/f2fs/inline.c | 115 +++++++++++++++- fs/f2fs/inode.c | 68 ++++++++- fs/f2fs/node.c | 103 ++++++++------ fs/f2fs/node.h | 77 +++++++---- fs/f2fs/recovery.c | 165 +++++++++++----------- fs/f2fs/segment.c | 93 +++++++------ fs/f2fs/segment.h | 48 +++++-- fs/f2fs/super.c | 134 +++++++++++++++--- fs/jffs2/super.c | 3 +- fs/ocfs2/localalloc.c | 9 +- fs/proc/array.c | 2 +- fs/pstore/ram_core.c | 5 + fs/xfs/libxfs/xfs_attr.c | 9 +- include/linux/backing-dev-defs.h | 8 ++ include/linux/f2fs_fs.h | 3 + mm/page-writeback.c | 35 +++-- net/bridge/br_netfilter_hooks.c | 2 +- net/can/gw.c | 30 +++- net/core/skbuff.c | 11 +- net/core/sock.c | 1 + net/ipv4/ip_sockglue.c | 12 +- net/ipv6/af_inet6.c | 14 +- net/ipv6/datagram.c | 11 +- net/packet/af_packet.c | 4 +- net/sctp/ipv6.c | 5 +- net/sctp/protocol.c | 4 +- net/sunrpc/rpcb_clnt.c | 8 ++ net/tipc/netlink_compat.c | 50 ++++++- scripts/kconfig/zconf.l | 4 +- security/security.c | 7 + security/selinux/ss/policydb.c | 3 +- security/yama/yama_lsm.c | 4 +- sound/firewire/bebob/bebob.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 11 ++ tools/perf/util/parse-events.c | 2 +- tools/perf/util/svghelper.c | 2 +- 81 files changed, 1335 insertions(+), 564 deletions(-)

6 years, 7 months

6
110
0 0

Will the recent memory leak fixes be backported to longterm kernels?

by Dexuan Cui

Hi all, When debugging a memory leak issue (https://github.com/coreos/bugs/issues/2516) with v4.14.11-coreos, we noticed the same issue may have been fixed recently by Roman in the latest mainline (i.e. Linus's master branch) according to comment #7 of https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1792349, which lists these patches (I'm not sure if the 5-patch list is complete): 010cb21d4ede math64: prevent double calculation of DIV64_U64_ROUND_UP() arguments f77d7a05670d mm: don't miss the last page because of round-off error d18bf0af683e mm: drain memcg stocks on css offlining 71cd51b2e1ca mm: rework memcg kernel stack accounting f3a2fccbce15 mm: slowly shrink slabs with a relatively small number of objects Obviously at least some of the fixes are also needed in the longterm kernels like v4.14.y, but none of the 5 patches has the "Cc: stable(a)vger.kernel.org" tag? I'm wondering if these patches will be backported to the longterm kernels. BTW, the patches are not in v4.19, but I suppose they will be in v4.19.1-rc1? Thanks, -- Dexuan

6 years, 7 months

6
18
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror