November 2019 - Linux-stable-mirror

[PATCH] usb: dwc3: gadget: Fix logical condition

by Tejas Joglekar

This patch corrects the condition to kick the transfer without giving back the requests when either request has remaining data or when there are pending SGs. The && check was introduced during spliting up the dwc3_gadget_ep_cleanup_completed_requests() function. Fixes: f38e35dd84e2 ("usb: dwc3: gadget: split dwc3_gadget_ep_cleanup_completed_requests()") Cc: stable(a)vger.kernel.org Signed-off-by: Tejas Joglekar <joglekar(a)synopsys.com> --- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 86dc1db788a9..e07159e06f9a 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2485,7 +2485,7 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep, req->request.actual = req->request.length - req->remaining; - if (!dwc3_gadget_ep_request_completed(req) && + if (!dwc3_gadget_ep_request_completed(req) || req->num_pending_sgs) { __dwc3_gadget_kick_transfer(dep); goto out; -- 2.11.0

4 years, 8 months

3
5
0 0

[PATCH 4.19 000/306] 4.19.87-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.87 release. There are 306 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 Fri, 29 Nov 2019 20:18:09 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.87-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.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.87-rc1 Michael Ellerman <mpe(a)ellerman.id.au> KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel Michael Ellerman <mpe(a)ellerman.id.au> powerpc/book3s64: Fix link stack flush on context switch Christopher M. Riedl <cmr(a)informatik.wtf> powerpc/64s: support nospectre_v2 cmdline option Bernd Porr <mail(a)berndporr.me.uk> staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error Aleksander Morgado <aleksander(a)aleksander.es> USB: serial: option: add support for Foxconn T77W968 LTE modules Aleksander Morgado <aleksander(a)aleksander.es> USB: serial: option: add support for DW5821e with eSIM support Johan Hovold <johan(a)kernel.org> USB: serial: mos7840: fix remote wakeup Johan Hovold <johan(a)kernel.org> USB: serial: mos7720: fix remote wakeup Pavel Löbl <pavel(a)loebl.cz> USB: serial: mos7840: add USB ID to support Moxa UPort 2210 Oliver Neukum <oneukum(a)suse.com> appledisplay: fix error handling in the scheduled work Oliver Neukum <oneukum(a)suse.com> USB: chaoskey: fix error case of a timeout Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> usb-serial: cp201x: support Mark-10 digital force gauge Suwan Kim <suwan.kim027(a)gmail.com> usbip: Fix uninitialized symbol 'nents' in stub_recv_cmd_submit() Hewenliang <hewenliang4(a)huawei.com> usbip: tools: fix fd leakage in the function of read_attr_usbip_status Oliver Neukum <oneukum(a)suse.com> USBIP: add config dependency for SGL_ALLOC Halil Pasic <pasic(a)linux.ibm.com> virtio_ring: fix return code on DMA mapping fails Sean Young <sean(a)mess.org> media: imon: invalid dereference in imon_touch_event Vito Caputo <vcaputo(a)pengaru.com> media: cxusb: detect cxusb_ctrl_msg error in query Oliver Neukum <oneukum(a)suse.com> media: b2c2-flexcop-usb: add sanity checking Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> media: uvcvideo: Fix error path in control parsing failure Kai Shen <shenkai8(a)huawei.com> cpufreq: Add NULL checks to show() and store() methods of cpufreq Alan Stern <stern(a)rowland.harvard.edu> media: usbvision: Fix races among open, close, and disconnect Alexander Popov <alex.popov(a)linux.com> media: vivid: Fix wrong locking that causes race conditions on streaming stop Vandana BN <bnvandana(a)gmail.com> media: vivid: Set vid_cap_streaming and vid_out_streaming to true Jouni Hogander <jouni.hogander(a)unikie.com> net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject Oliver Neukum <oneukum(a)suse.com> nfc: port100: handle command failure cleanly Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix NULL dereference at parsing BADD Yang Tao <yang.tao172(a)zte.com.cn> futex: Prevent robust futex exit race Arnd Bergmann <arnd(a)arndb.de> y2038: futex: Move compat implementation into futex.c Andy Lutomirski <luto(a)kernel.org> x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 Ingo Molnar <mingo(a)kernel.org> x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise Andy Lutomirski <luto(a)kernel.org> selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel Andy Lutomirski <luto(a)kernel.org> selftests/x86/mov_ss_trap: Fix the SYSENTER test Thomas Gleixner <tglx(a)linutronix.de> x86/cpu_entry_area: Add guard page for entry stack on 32bit Thomas Gleixner <tglx(a)linutronix.de> x86/pti/32: Size initial_page_table correctly Andy Lutomirski <luto(a)kernel.org> x86/doublefault/32: Fix stack canaries in the double fault handler Navid Emamdoost <navid.emamdoost(a)gmail.com> nbd: prevent memory leak Waiman Long <longman(a)redhat.com> x86/speculation: Fix redundant MDS mitigation message Waiman Long <longman(a)redhat.com> x86/speculation: Fix incorrect MDS/TAA mitigation status Alexander Kapshuk <alexander.kapshuk(a)gmail.com> x86/insn: Fix awk regexp warnings Alexey Brodkin <Alexey.Brodkin(a)synopsys.com> ARC: perf: Accommodate big-endian CPU Chester Lin <clin(a)suse.com> ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Gang He <ghe(a)suse.com> ocfs2: remove ocfs2_is_o2cb_active() Max Uvarov <muvarov(a)gmail.com> net: phy: dp83867: increase SGMII autoneg timer duration Max Uvarov <muvarov(a)gmail.com> net: phy: dp83867: fix speed 10 in sgmii mode David Hildenbrand <david(a)redhat.com> mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() John Pittman <jpittman(a)redhat.com> md/raid10: prevent access of uninitialized resync_pages offset Denis Efremov <efremov(a)linux.com> ath9k_hw: fix uninitialized variable data Hui Peng <benquike(a)gmail.com> ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved Tomas Bortoli <tomasbortoli(a)gmail.com> Bluetooth: Fix invalid-free in bcsp_close() Vinayak Menon <vinmenon(a)codeaurora.org> mm/page_io.c: do not free shared swap slots Johannes Berg <johannes.berg(a)intel.com> cfg80211: call disconnect_wk when AP stops David Ahern <dsahern(a)gmail.com> ipv6: Fix handling of LLA with VRF and sockets bound to VRF zhong jiang <zhongjiang(a)huawei.com> mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock Masahiro Yamada <yamada.masahiro(a)socionext.com> i2c: uniphier-f: fix timeout error after reading 8 bytes Vignesh R <vigneshr(a)ti.com> spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch Igor Konopko <igor.j.konopko(a)intel.com> nvme-pci: fix surprise removal Kishon Vijay Abraham I <kishon(a)ti.com> PCI: keystone: Use quirk to limit MRRS for K2G Nathan Chancellor <natechancellor(a)gmail.com> pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD Nathan Chancellor <natechancellor(a)gmail.com> pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT Nathan Chancellor <natechancellor(a)gmail.com> pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL Brian Masney <masneyb(a)onstation.org> pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues Sriram R <srirrama(a)codeaurora.org> cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces Quentin Monnet <quentin.monnet(a)netronome.com> tools: bpftool: pass an argument to silence open_obj_pinned() Frank Rowand <frank.rowand(a)sony.com> of: unittest: initialize args before calling of_*parse_*() Frank Rowand <frank.rowand(a)sony.com> of: unittest: allow base devicetree to have symbol metadata David Barmann <david.barmann(a)stackpath.com> sock: Reset dst when changing sk_mark via setsockopt YueHaibing <yuehaibing(a)huawei.com> net: bcmgenet: return correct value 'ret' from bcmgenet_power_down Colin Ian King <colin.king(a)canonical.com> ACPICA: Use %d for signed int print formatting instead of %u Dmitry Osipenko <digetx(a)gmail.com> clk: tegra20: Turn EMC clock gate into divider Mike Manning <mmanning(a)vyatta.att-mail.com> vrf: mark skb for multicast or link-local as enslaved to VRF Tycho Andersen <tycho(a)tycho.ws> dlm: don't leak kernel pointer to userspace Tycho Andersen <tycho(a)tycho.ws> dlm: fix invalid free Badhri Jagan Sridharan <badhri(a)google.com> usb: typec: tcpm: charge current handling for sink during hard reset James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Correct loss of fc4 type on remote port address change James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix odd recovery in duplicate FLOGIs in point-to-point James Smart <jsmart2021(a)gmail.com> scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces Shivasharan S <shivasharan.srikanteshwara(a)broadcom.com> scsi: megaraid_sas: Fix goto labels in error handling Shivasharan S <shivasharan.srikanteshwara(a)broadcom.com> scsi: megaraid_sas: Fix msleep granularity Suganath Prabu <suganath-prabu.subramani(a)broadcom.com> scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11 Suganath Prabu <suganath-prabu.subramani(a)broadcom.com> scsi: mpt3sas: Don't modify EEDPTagMode field setting on SAS3.5 HBA devices Suganath Prabu <suganath-prabu.subramani(a)broadcom.com> scsi: mpt3sas: Fix Sync cache command failure during driver unload Florian Fainelli <f.fainelli(a)gmail.com> net: dsa: bcm_sf2: Turn on PHY to allow successful registration Shaokun Zhang <zhangshaokun(a)hisilicon.com> rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information Dan Carpenter <dan.carpenter(a)oracle.com> wireless: airo: potential buffer overflow in sprintf() Ali MJ Al-Nasrawy <alimjalnasrawy(a)gmail.com> brcmsmac: never log "tid x is not agg'able" by default Gustavo A. R. Silva <gustavo(a)embeddedor.com> rtl8xxxu: Fix missing break in switch Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()' Brian Norris <briannorris(a)chromium.org> ath10k: snoc: fix unbalanced clock error handling Lior David <liord(a)codeaurora.org> wil6210: fix locking in wmi_call Maya Erez <merez(a)codeaurora.org> wil6210: fix RGF_CAF_ICR address for Talyn-MB Maya Erez <merez(a)codeaurora.org> wil6210: fix L2 RX status handling Ahmad Masri <amasri(a)codeaurora.org> wil6210: fix debugfs memory access alignment Arnd Bergmann <arnd(a)arndb.de> btrfs: avoid link error with CONFIG_NO_AUTO_INLINE Chiranjeevi Rapolu <chiranjeevi.rapolu(a)intel.com> media: ov13858: Check for possible null pointer Nickhu <nickhu(a)andestech.com> nds32: Fix bug in bitfield.h Taehee Yoo <ap420073(a)gmail.com> net: bpfilter: fix iptables failure if bpfilter_umh is disabled Andrei Vagin <avagin(a)gmail.com> sock_diag: fix autoloading of the raw_diag module Richard Guy Briggs <rgb(a)redhat.com> audit: print empty EXECVE args Florian Fainelli <f.fainelli(a)gmail.com> soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL Icenowy Zheng <icenowy(a)aosc.io> clk: sunxi-ng: enable so-said LDOs for A64 SoC's pll-mipi clock Leonard Crestez <leonard.crestez(a)nxp.com> ARM: dts: imx6sx-sdb: Fix enet phy regulator Arnd Bergmann <arnd(a)arndb.de> openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS Valentin Schneider <valentin.schneider(a)arm.com> sched/fair: Don't increase sd->balance_interval on newidle balance Peter Zijlstra <peterz(a)infradead.org> sched/topology: Fix off by one bug Eric Dumazet <edumazet(a)google.com> net: do not abort bulk send on BQL status Larry Chen <lchen(a)suse.com> ocfs2: fix clusters leak in ocfs2_defrag_extent() Changwei Ge <ge.changwei(a)h3c.com> ocfs2: don't put and assigning null to bh allocated outside Changwei Ge <ge.changwei(a)h3c.com> ocfs2: don't use iocb when EIOCBQUEUED returns Guozhonghua <guozhonghua(a)h3c.com> ocfs2: without quota support, avoid calling quota recovery Roman Gushchin <guro(a)fb.com> mm: handle no memcg case in memcg_kmem_charge() properly Len Brown <len.brown(a)intel.com> tools/power turbosat: fix AMD APIC-id output Victor Kamensky <kamensky(a)cisco.com> arm64: makefile fix build of .i file in external module case Keith Busch <keith.busch(a)intel.com> nvme-pci: fix conflicting p2p resource adds Michael Kelley <mikelley(a)microsoft.com> irq/matrix: Fix memory overallocation Dave Jiang <dave.jiang(a)intel.com> ntb: intel: fix return value for ndev_vec_mask() Jon Mason <jdmason(a)kudzu.us> ntb_netdev: fix sleep time mismatch Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for is_valid_csq_clean_head() Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for reporting unknown vector0 interrupt repeatly problem Huazhong Tan <tanhuazhong(a)huawei.com> net: hns3: bugfix for buffer not free problem during resetting Jacob Keller <jacob.e.keller(a)intel.com> fm10k: ensure completer aborts are marked as non-fatal after a resume Miroslav Lichvar <mlichvar(a)redhat.com> igb: shorten maximum PHC timecounter update interval David Hildenbrand <david(a)redhat.com> powerpc/powernv: hold device_hotplug_lock when calling device_online() David Hildenbrand <david(a)redhat.com> mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock David Hildenbrand <david(a)redhat.com> mm/memory_hotplug: make add_memory() take the device_hotplug_lock Borislav Petkov <bp(a)suse.de> kernel/panic.c: do not append newline to the stack protector panic string Colin Ian King <colin.king(a)canonical.com> fs/hfs/extent.c: fix array out of bounds read of array extent Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: update timestamp on truncate() Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: update timestamps on truncate() Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: fix return value of hfs_get_block() Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: fix return value of hfsplus_get_block() Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent btree data loss on ENOSPC Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: prevent btree data loss on ENOSPC Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: fix BUG on bnode parent update Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: fix BUG on bnode parent update Rasmus Villemoes <linux(a)rasmusvillemoes.dk> lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf Rasmus Villemoes <linux(a)rasmusvillemoes.dk> linux/bitmap.h: fix type of nbits in bitmap_shift_right() Rasmus Villemoes <linux(a)rasmusvillemoes.dk> linux/bitmap.h: handle constant zero-size bitmaps correctly Dan Carpenter <dan.carpenter(a)oracle.com> mm/gup_benchmark.c: prevent integer overflow in ioctl Ming Lei <ming.lei(a)redhat.com> block: call rq_qos_exit() after queue is frozen Michael Ellerman <mpe(a)ellerman.id.au> selftests/powerpc/cache_shape: Fix out-of-tree build Michael Ellerman <mpe(a)ellerman.id.au> selftests/powerpc/switch_endian: Fix out-of-tree build Joel Stanley <joel(a)jms.id.au> selftests/powerpc/signal: Fix out-of-tree build Joel Stanley <joel(a)jms.id.au> selftests/powerpc/ptrace: Fix out-of-tree build Joel Stanley <joel(a)jms.id.au> powerpc/xmon: Relax frame size for clang Hangbin Liu <liuhangbin(a)gmail.com> ipv4/igmp: fix v1/v2 switchback timeout based on rfc3376, 8.12 Darrick J. Wong <darrick.wong(a)oracle.com> vfs: avoid problematic remapping requests into partial EOF block Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: Make line/tty semantics use true write IRQ Masahiro Yamada <yamada.masahiro(a)socionext.com> i2c: uniphier-f: fix race condition when IRQ is cleared Masahiro Yamada <yamada.masahiro(a)socionext.com> i2c: uniphier-f: fix occasional timeout error Masahiro Yamada <yamada.masahiro(a)socionext.com> i2c: uniphier-f: make driver robust against concurrency Jianchao Wang <jianchao.w.wang(a)oracle.com> block: fix the DISCARD request merge Sabrina Dubroca <sd(a)queasysnail.net> macsec: let the administrator set UP state even if lowerdev is down Sabrina Dubroca <sd(a)queasysnail.net> macsec: update operstate when lower device changes Andrea Arcangeli <aarcange(a)redhat.com> mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition Keith Busch <keith.busch(a)intel.com> tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage Dave Chinner <dchinner(a)redhat.com> mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock Jia-Ju Bai <baijiaju1990(a)gmail.com> fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle() Andrey Ryabinin <aryabinin(a)virtuozzo.com> arm64: lib: use C string functions with KASAN enabled David S. Miller <davem(a)davemloft.net> sparc64: Rework xchg() definition to avoid warnings. Felipe Rechia <felipe.rechia(a)datacom.com.br> powerpc/process: Fix flush_all_to_thread for SPE Martin Lau <kafai(a)fb.com> bpf, btf: fix a missing check bug in btf_parse Taehee Yoo <ap420073(a)gmail.com> bpf: devmap: fix wrong interface selection in notifier_call Tristram Ha <Tristram.Ha(a)microchip.com> net: ethernet: cadence: fix socket buffer corruption problem Geert Uytterhoeven <geert+renesas(a)glider.be> thermal: rcar_thermal: Prevent hardware access during system suspend Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> thermal: rcar_thermal: fix duplicate IRQ request Peng Hao <peng.hao2(a)zte.com.cn> selftests: fix warning: "_GNU_SOURCE" redefined Andrea Parri <andrea.parri(a)amarulasolutions.com> selftests: kvm: Fix -Wformat warnings Jerry Hoemann <jerry.hoemann(a)hpe.com> selftests: watchdog: Fix error message. Shuah Khan (Samsung OSG) <shuah(a)kernel.org> selftests: watchdog: fix message when /dev/watchdog open fails Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Fix to test kprobe $comm arg only if available Keiji Hayashibara <hayashibara.keiji(a)socionext.com> spi: uniphier: fix incorrect property items Garry McNulty <garrmcnu(a)gmail.com> fs/cifs: fix uninitialised variable warnings Masahisa Kojima <masahisa.kojima(a)linaro.org> net: socionext: Stop PHY before resetting netsec Marek Szyprowski <m.szyprowski(a)samsung.com> mfd: max8997: Enale irq-wakeup unconditionally Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well Fabio Estevam <fabio.estevam(a)nxp.com> mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values Sapthagiri Baratam <sapthagiri.baratam(a)cirrus.com> mfd: arizona: Correct calling of runtime_put_sync Ivan Khoronzhuk <ivan.khoronzhuk(a)linaro.org> net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode Dan Carpenter <dan.carpenter(a)oracle.com> qlcnic: fix a return in qlcnic_dcb_get_capability() Nathan Chancellor <natechancellor(a)gmail.com> mISDN: Fix type of switch control variable in ctrl_teimanager Chao Yu <yuchao0(a)huawei.com> f2fs: spread f2fs_set_inode_flags() Chao Yu <yuchao0(a)huawei.com> f2fs: fix to spread clear_cold_data() Dan Carpenter <dan.carpenter(a)oracle.com> thermal: armada: fix a test in probe() Vincent Chen <vincentc(a)andestech.com> RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap Nathan Chancellor <natechancellor(a)gmail.com> rtc: s35390a: Change buf's type to u8 in s35390a_init Luis Henriques <lhenriques(a)suse.com> ceph: only allow punch hole mode in fallocate Yan, Zheng <zyan(a)redhat.com> ceph: fix dentry leak in ceph_readdir_prepopulate Quentin Monnet <quentin.monnet(a)netronome.com> tools: bpftool: fix completion for "bpftool map update" Quentin Monnet <quentin.monnet(a)netronome.com> selftests/bpf: fix return value comparison for tests in test_libbpf.sh Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm/radix: Fix small page at boundary when splitting Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm/radix: Fix overuse of small pages in splitting logic Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm/radix: Fix off-by-one in split mapping logic Aravinda Prasad <aravinda(a)linux.vnet.ibm.com> powerpc/pseries: Export raw per-CPU VPA data via debugfs Gustavo A. R. Silva <gustavo(a)embeddedor.com> scsi: hisi_sas: Fix NULL pointer dereference David S. Miller <davem(a)davemloft.net> sparc: Fix parport build warnings. Jithu Joseph <jithu.joseph(a)intel.com> x86/intel_rdt: Prevent pseudo-locking from using stale pointers Vignesh R <vigneshr(a)ti.com> spi: omap2-mcspi: Set FIFO DMA trigger level to word length Christoph Hellwig <hch(a)lst.de> swiotlb: do not panic on mapping failures Thomas Richter <tmricht(a)linux.ibm.com> s390/perf: Return error when debug_register fails Nathan Chancellor <natechancellor(a)gmail.com> atm: zatm: Fix empty body Clang warnings J. Bruce Fields <bfields(a)redhat.com> sunrpc: safely reallow resvport min/max inversion Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: Fix a compile warning for cmpxchg64() Peng Hao <peng.hao2(a)zte.com.cn> selftests/bpf: fix file resource leak in load_kallsyms Heinz Mauelshagen <heinzm(a)redhat.com> dm raid: avoid bitmap with raid4/5/6 journal device Xin Long <lucien.xin(a)gmail.com> sctp: use sk_wmem_queued to check for writable space Colin Ian King <colin.king(a)canonical.com> usbip: tools: fix atoi() on non-null terminated string Mattias Jacobsson <2pi(a)mok.nu> USB: misc: appledisplay: fix backlight update_status return code Jon Derrick <jonathan.derrick(a)intel.com> PCI: vmd: Detach resources after stopping root bus Benjamin Herrenschmidt <benh(a)kernel.crashing.org> macintosh/windfarm_smu_sat: Fix debug output Philipp Klocke <philipp97kl(a)gmail.com> ALSA: i2c/cs8427: Fix int to char conversion Ulf Hansson <ulf.hansson(a)linaro.org> PM / Domains: Deal with multiple states but no governor in genpd Hans de Goede <hdegoede(a)redhat.com> ACPI / scan: Create platform device for INT33FE ACPI nodes Steven Rostedt (VMware) <rostedt(a)goodmis.org> kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack Brian Foster <bfoster(a)redhat.com> xfs: clear ail delwri queued bufs on unmount of shutdown fs Dave Chinner <dchinner(a)redhat.com> xfs: fix use-after-free race in xfs_buf_rele Netanel Belgazal <netanel(a)amazon.com> net: ena: Fix Kconfig dependency on X86 Kyeongdon Kim <kyeongdon.kim(a)lge.com> net: fix warning in af_unix Marek Behún <marek.behun(a)nic.cz> net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed Finn Thain <fthain(a)telegraphics.com.au> scsi: zorro_esp: Limit DMA transfers to 65535 bytes Christoph Hellwig <hch(a)lst.de> scsi: dc395x: fix DMA API usage in sg_update_list Christoph Hellwig <hch(a)lst.de> scsi: dc395x: fix dma API usage in srb_done Marcel Ziswiler <marcel.ziswiler(a)toradex.com> ASoC: tegra_sgtl5000: fix device_node refcounting Alexandre Belloni <alexandre.belloni(a)bootlin.com> clk: at91: audio-pll: fix audio pmc type Lubomir Rintel <lkundrak(a)v3.sk> clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk Honghui Zhang <honghui.zhang(a)mediatek.com> PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks Keith Busch <keith.busch(a)intel.com> nvme-pci: fix hot removal during error handling Bart Van Assche <bvanassche(a)acm.org> nvmet-fcloop: suppress a compiler warning Bart Van Assche <bvanassche(a)acm.org> nvmet: avoid integer overflow in the discard code Nathan Chancellor <natechancellor(a)gmail.com> crypto: ccree - avoid implicit enum conversion Nathan Chancellor <natechancellor(a)gmail.com> scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param Nathan Chancellor <natechancellor(a)gmail.com> scsi: bfa: Avoid implicit enum conversion in bfad_im_post_vendor_event Nathan Chancellor <natechancellor(a)gmail.com> scsi: isci: Change sci_controller_start_task's return type to sci_status Nathan Chancellor <natechancellor(a)gmail.com> scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler Joseph Lo <josephl(a)nvidia.com> clk: tegra: Fixes for MBIST work around Uros Bizjak <ubizjak(a)gmail.com> KVM/x86: Fix invvpid and invept register operand size in 64-bit mode Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode() Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: reset cache/shadows when switching loaded VMCS Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: bpf: protect against mis-initializing atomic counters Gustavo A. R. Silva <gustavo(a)embeddedor.com> scsi: ips: fix missing break in switch Rahul Verma <Rahul.Verma(a)cavium.com> qed: Align local and global PTT to propagate through the APIs. Omar Sandoval <osandov(a)fb.com> amiflop: clean up on errors during setup Hans de Goede <hdegoede(a)redhat.com> pwm: lpss: Only set update bit if we are actually changing the settings Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()' Selvin Xavier <selvin.xavier(a)broadcom.com> RDMA/bnxt_re: Avoid resource leak in case the NQ registration fails Devesh Sharma <devesh.sharma(a)broadcom.com> RDMA/bnxt_re: Fix qp async event reporting Selvin Xavier <selvin.xavier(a)broadcom.com> RDMA/bnxt_re: Avoid NULL check after accessing the pointer Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Free slot later in slot_complete_vx_hw() Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO Luo Jiaxing <luojiaxing(a)huawei.com> scsi: hisi_sas: Feed back linkrate(max/min) when re-attached Angelo Dureghello <angelo(a)sysam.it> m68k: fix command-line parsing when passed from u-boot Julien Folly <julien.folly(a)gmail.com> w1: IAD Register is yet readable trough iad sys file. Fix snprintf (%u for unsigned, count for max size). Wenwen Wang <wang6495(a)umn.edu> misc: mic: fix a DMA pool free failure Duncan Laurie <dlaurie(a)chromium.org> gsmi: Fix bug in append_to_eventlog sysfs handler Nikolay Borisov <nborisov(a)suse.com> btrfs: handle error of get_old_root Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: defrag: use btrfs_mod_outstanding_extents in cluster_pages_for_defrag Honghui Zhang <honghui.zhang(a)mediatek.com> PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI Chaotian Jing <chaotian.jing(a)mediatek.com> mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail Chaotian Jing <chaotian.jing(a)mediatek.com> mmc: mediatek: fill the actual clock for mmc debugfs Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> spi: sh-msiof: fix deferred probing Jens Axboe <axboe(a)kernel.dk> cdrom: don't attempt to fiddle with cdo->capability Jens Axboe <axboe(a)kernel.dk> skd: fixup usage of legacy IO API Carl Huang <cjhuang(a)codeaurora.org> ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem Rakesh Pillai <pillair(a)codeaurora.org> ath10k: set probe request oui during driver start Ali MJ Al-Nasrawy <alimjalnasrawy(a)gmail.com> brcmsmac: AP mode: update beacon when TIM changes Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> mt76x0: phy: fix restore phase in mt76x0_phy_recalibrate_after_assoc Felix Fietkau <nbd(a)nbd.name> mt76: do not store aggregation sequence number for null-data frames Dan Carpenter <dan.carpenter(a)oracle.com> EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr() Sam Bobroff <sbobroff(a)linux.ibm.com> powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field Sam Bobroff <sbobroff(a)linux.ibm.com> powerpc/eeh: Fix null deref for devices removed during EEH Joel Stanley <joel(a)jms.id.au> powerpc/boot: Disable vector instructions Joel Stanley <joel(a)jms.id.au> powerpc/boot: Fix opal console in boot wrapper Dan Carpenter <dan.carpenter(a)oracle.com> powerpc: Fix signedness bug in update_flash_db() Al Viro <viro(a)zeniv.linux.org.uk> synclink_gt(): fix compat_ioctl() Al Viro <viro(a)zeniv.linux.org.uk> pty: fix compat ioctls Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix marking bitmaps non-full Alan Douglas <adouglas(a)cadence.com> PCI: cadence: Write MSI data with 32bits Gustavo A. R. Silva <gustavo(a)embeddedor.com> pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux Sergey Senozhatsky <sergey.senozhatsky(a)gmail.com> printk: fix integer overflow in setup_log_buf() Sergey Senozhatsky <sergey.senozhatsky(a)gmail.com> printk: lock/unlock console only for new logbuf entries Michael Schupikov <michael(a)schupikov.de> crypto: testmgr - fix sizeof() on COMP_BUF_SIZE Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback Adrian Bunk <bunk(a)kernel.org> mwifiex: Fix NL80211_TX_POWER_LIMITED Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915/userptr: Try to acquire the page lock around set_page_dirty() Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915/pmu: "Frequency" is reported as accumulated cycles Evan Quan <evan.quan(a)amd.com> drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs Andrey Ryabinin <aryabinin(a)virtuozzo.com> mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() Joseph Qi <joseph.qi(a)linux.alibaba.com> Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()" Laurent Vivier <lvivier(a)redhat.com> virtio_console: allocate inbufs in add_port() only if it is needed Sun Ke <sunke32(a)huawei.com> nbd:fix memory leak in nbd_get_socket() Laura Abbott <labbott(a)redhat.com> tools: gpio: Correctly add make dependencies for gpio_utils Thierry Reding <treding(a)nvidia.com> gpio: max77620: Fixup debounce delays Stefano Garzarella <sgarzare(a)redhat.com> vhost/vsock: split packets to send using multiple buffers Maor Gottlieb <maorg(a)mellanox.com> net/mlx5: Fix auto group size calculation Eran Ben Elisha <eranbe(a)mellanox.com> net/mlxfw: Verify FSM error code translation doesn't exceed array size Roi Dayan <roid(a)mellanox.com> net/mlx5e: Fix set vf link state error flow Martin Habets <mhabets(a)solarflare.com> sfc: Only cancel the PPS workqueue if it exists Xin Long <lucien.xin(a)gmail.com> net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key Davide Caratti <dcaratti(a)redhat.com> net/sched: act_pedit: fix WARN() in the traffic path Dan Carpenter <dan.carpenter(a)oracle.com> net: rtnetlink: prevent underflows in do_setvfinfo() Tariq Toukan <tariqt(a)mellanox.com> net/mlx4_en: Fix wrong limitation for number of TX rings Luigi Rizzo <lrizzo(a)google.com> net/mlx4_en: fix mlx4 ethtool -N insertion Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel ------------- Diffstat: Documentation/admin-guide/hw-vuln/mds.rst | 7 +- .../admin-guide/hw-vuln/tsx_async_abort.rst | 5 +- Documentation/admin-guide/kernel-parameters.txt | 11 + .../devicetree/bindings/spi/spi-uniphier.txt | 14 +- Makefile | 4 +- arch/arc/kernel/perf_event.c | 4 +- arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 +- arch/arm/mm/mmu.c | 3 + arch/arm64/Makefile | 2 + arch/arm64/include/asm/string.h | 14 +- arch/arm64/kernel/arm64ksyms.c | 7 +- arch/arm64/lib/memchr.S | 2 +- arch/arm64/lib/memcmp.S | 2 +- arch/arm64/lib/strchr.S | 2 +- arch/arm64/lib/strcmp.S | 2 +- arch/arm64/lib/strlen.S | 2 +- arch/arm64/lib/strncmp.S | 2 +- arch/arm64/lib/strnlen.S | 2 +- arch/arm64/lib/strrchr.S | 2 +- arch/m68k/kernel/uboot.c | 2 +- arch/nds32/include/asm/bitfield.h | 4 +- arch/powerpc/boot/Makefile | 4 +- arch/powerpc/boot/opal.c | 8 - arch/powerpc/include/asm/asm-prototypes.h | 3 + arch/powerpc/include/asm/security_features.h | 3 + arch/powerpc/kernel/eeh_driver.c | 4 + arch/powerpc/kernel/eeh_pe.c | 2 +- arch/powerpc/kernel/entry_64.S | 6 + arch/powerpc/kernel/process.c | 3 +- arch/powerpc/kernel/security.c | 74 +++++- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 +++ arch/powerpc/mm/pgtable-radix.c | 8 +- arch/powerpc/mm/tlb-radix.c | 1 - arch/powerpc/platforms/powernv/memtrace.c | 2 + arch/powerpc/platforms/ps3/os-area.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- arch/powerpc/platforms/pseries/lpar.c | 54 +++++ arch/powerpc/xmon/Makefile | 6 + arch/riscv/mm/ioremap.c | 2 +- arch/s390/kernel/perf_cpum_sf.c | 6 +- arch/sparc/include/asm/cmpxchg_64.h | 7 +- arch/sparc/include/asm/parport.h | 2 + arch/um/drivers/line.c | 4 +- arch/x86/entry/entry_32.S | 21 +- arch/x86/include/asm/cpu_entry_area.h | 18 +- arch/x86/include/asm/pgtable_32_types.h | 8 +- arch/x86/include/asm/ptrace.h | 42 +++- arch/x86/kernel/cpu/bugs.c | 30 ++- arch/x86/kernel/cpu/intel_rdt.c | 7 + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 12 +- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 10 + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 38 +++- arch/x86/kernel/doublefault.c | 3 + arch/x86/kernel/head_32.S | 10 + arch/x86/kvm/mmu.c | 8 +- arch/x86/kvm/vmx.c | 22 +- arch/x86/mm/cpu_entry_area.c | 4 +- arch/x86/tools/gen-insn-attr-x86.awk | 4 +- block/blk-core.c | 3 + block/blk-merge.c | 46 +++- block/blk-sysfs.c | 2 - crypto/testmgr.c | 6 +- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/acpi/scan.c | 1 + drivers/atm/zatm.c | 42 ++-- drivers/base/memory.c | 22 +- drivers/base/power/domain.c | 6 + drivers/block/amiflop.c | 84 ++++--- drivers/block/nbd.c | 6 +- drivers/block/skd_main.c | 4 +- drivers/bluetooth/hci_bcsp.c | 3 + drivers/cdrom/cdrom.c | 27 ++- drivers/char/virtio_console.c | 28 ++- drivers/clk/at91/clk-audio-pll.c | 2 +- drivers/clk/mmp/clk-of-mmp2.c | 4 +- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- drivers/clk/tegra/clk-tegra20.c | 36 ++- drivers/clk/tegra/clk-tegra210.c | 6 +- drivers/cpufreq/cpufreq.c | 6 + drivers/crypto/ccree/cc_hw_queue_defs.h | 6 +- drivers/edac/thunderx_edac.c | 4 +- drivers/firmware/google/gsmi.c | 5 +- drivers/gpio/gpio-max77620.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 23 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 22 +- drivers/gpu/drm/i915/i915_pmu.c | 4 +- drivers/i2c/busses/i2c-uniphier-f.c | 72 ++++-- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 + drivers/infiniband/hw/bnxt_re/main.c | 44 ++-- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 +- drivers/isdn/mISDN/tei.c | 7 +- drivers/macintosh/windfarm_smu_sat.c | 25 +-- drivers/md/dm-raid.c | 2 +- drivers/md/raid10.c | 2 +- drivers/media/i2c/ov13858.c | 6 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 8 +- drivers/media/platform/vivid/vivid-kthread-out.c | 8 +- drivers/media/platform/vivid/vivid-sdr-cap.c | 8 +- drivers/media/platform/vivid/vivid-vid-cap.c | 3 - drivers/media/platform/vivid/vivid-vid-out.c | 3 - drivers/media/rc/imon.c | 3 +- drivers/media/usb/b2c2/flexcop-usb.c | 3 + drivers/media/usb/dvb-usb/cxusb.c | 3 +- drivers/media/usb/usbvision/usbvision-video.c | 21 +- drivers/media/usb/uvc/uvc_driver.c | 28 +-- drivers/mfd/arizona-core.c | 8 +- drivers/mfd/intel_soc_pmic_bxtwc.c | 41 +++- drivers/mfd/max8997.c | 8 +- drivers/mfd/mc13xxx-core.c | 3 +- drivers/misc/mic/scif/scif_fence.c | 2 +- drivers/mmc/host/mtk-sd.c | 15 +- drivers/net/dsa/bcm_sf2.c | 4 + drivers/net/dsa/mv88e6xxx/chip.c | 4 +- drivers/net/dsa/mv88e6xxx/port.c | 25 ++- drivers/net/dsa/mv88e6xxx/port.h | 1 + drivers/net/ethernet/amazon/Kconfig | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 24 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 48 ++-- drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 9 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 9 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 2 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 19 +- drivers/net/ethernet/netronome/nfp/bpf/main.h | 7 +- drivers/net/ethernet/netronome/nfp/bpf/offload.c | 18 +- drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 58 ++++- drivers/net/ethernet/qlogic/qed/qed.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 22 +- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 27 +-- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 5 +- drivers/net/ethernet/qlogic/qed/qed_vf.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 +- drivers/net/ethernet/sfc/ptp.c | 3 +- drivers/net/ethernet/socionext/netsec.c | 19 +- drivers/net/ethernet/ti/cpsw.c | 1 + drivers/net/macsec.c | 20 +- drivers/net/ntb_netdev.c | 2 +- drivers/net/phy/dp83867.c | 37 +++ drivers/net/vrf.c | 19 +- drivers/net/wireless/ath/ath10k/mac.c | 14 +- drivers/net/wireless/ath/ath10k/pci.c | 23 +- drivers/net/wireless/ath/ath10k/snoc.c | 2 +- drivers/net/wireless/ath/ath10k/usb.c | 8 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/wil6210/debugfs.c | 15 +- drivers/net/wireless/ath/wil6210/main.c | 11 +- drivers/net/wireless/ath/wil6210/txrx_edma.c | 23 +- drivers/net/wireless/ath/wil6210/wil6210.h | 1 + drivers/net/wireless/ath/wil6210/wmi.c | 9 +- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 30 ++- .../wireless/broadcom/brcm80211/brcmsmac/main.h | 1 + drivers/net/wireless/cisco/airo.c | 2 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 13 +- drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 11 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 7 +- drivers/net/wireless/mediatek/mt76/tx.c | 3 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- drivers/nfc/port100.c | 2 +- drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/pci.c | 8 +- drivers/nvme/target/fcloop.c | 1 + drivers/nvme/target/io-cmd-file.c | 3 +- drivers/of/unittest.c | 58 ++++- drivers/pci/controller/dwc/pci-keystone.c | 3 + drivers/pci/controller/pcie-cadence-ep.c | 2 +- drivers/pci/controller/pcie-mediatek.c | 143 ++++++------ drivers/pci/controller/vmd.c | 2 +- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 +- drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +- drivers/pinctrl/pinctrl-lpc18xx.c | 10 +- drivers/pinctrl/pinctrl-zynq.c | 9 +- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 11 +- drivers/platform/x86/intel_cht_int33fe.c | 24 +- drivers/pwm/pwm-lpss.c | 12 +- drivers/rtc/rtc-s35390a.c | 2 +- drivers/scsi/bfa/bfa_defs_svc.h | 2 +- drivers/scsi/bfa/bfad_im.h | 2 +- drivers/scsi/dc395x.c | 12 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 56 ++++- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/ips.c | 1 + drivers/scsi/isci/host.c | 8 +- drivers/scsi/isci/host.h | 2 +- drivers/scsi/isci/request.c | 4 +- drivers/scsi/isci/task.c | 4 +- drivers/scsi/iscsi_tcp.c | 3 +- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 95 ++++++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 29 +++ drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +- drivers/scsi/lpfc/lpfc_sli.c | 11 +- drivers/scsi/lpfc/lpfc_sli4.h | 1 + drivers/scsi/megaraid/megaraid_sas_base.c | 9 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 ++- drivers/scsi/zorro_esp.c | 8 +- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 +- drivers/spi/spi-omap2-mcspi.c | 26 +-- drivers/spi/spi-sh-msiof.c | 4 +- drivers/staging/comedi/drivers/usbduxfast.c | 21 +- drivers/thermal/armada_thermal.c | 4 +- drivers/thermal/rcar_thermal.c | 6 +- drivers/tty/pty.c | 14 +- drivers/tty/synclink_gt.c | 16 +- drivers/usb/misc/appledisplay.c | 15 +- drivers/usb/misc/chaoskey.c | 24 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/mos7720.c | 4 - drivers/usb/serial/mos7840.c | 16 +- drivers/usb/serial/option.c | 7 + drivers/usb/typec/tcpm.c | 9 +- drivers/usb/usbip/Kconfig | 1 + drivers/usb/usbip/stub_rx.c | 50 +++-- drivers/vhost/vsock.c | 66 ++++-- drivers/virtio/virtio_ring.c | 2 +- drivers/w1/slaves/w1_ds2438.c | 66 ++++-- drivers/xen/balloon.c | 3 + fs/btrfs/ctree.c | 4 + fs/btrfs/ioctl.c | 2 +- fs/btrfs/super.c | 6 +- fs/ceph/file.c | 45 +--- fs/ceph/inode.c | 1 - fs/cifs/smb2pdu.c | 6 +- fs/dlm/member.c | 5 +- fs/dlm/user.c | 2 +- fs/f2fs/data.c | 8 +- fs/f2fs/dir.c | 1 + fs/f2fs/f2fs.h | 2 +- fs/f2fs/namei.c | 2 + fs/f2fs/segment.c | 4 +- fs/f2fs/super.c | 5 +- fs/gfs2/rgrp.c | 13 +- fs/hfs/brec.c | 1 + fs/hfs/btree.c | 41 ++-- fs/hfs/btree.h | 1 + fs/hfs/catalog.c | 16 ++ fs/hfs/extent.c | 10 +- fs/hfs/inode.c | 2 + fs/hfsplus/attributes.c | 10 + fs/hfsplus/brec.c | 1 + fs/hfsplus/btree.c | 44 ++-- fs/hfsplus/catalog.c | 24 ++ fs/hfsplus/extents.c | 8 +- fs/hfsplus/hfsplus_fs.h | 2 + fs/hfsplus/inode.c | 1 + fs/ocfs2/buffer_head_io.c | 77 +++++-- fs/ocfs2/dlm/dlmdebug.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/journal.c | 51 +++-- fs/ocfs2/move_extents.c | 17 ++ fs/ocfs2/stackglue.c | 6 - fs/ocfs2/stackglue.h | 3 - fs/ocfs2/xattr.c | 56 +++-- fs/read_write.c | 33 +++ fs/xfs/xfs_buf.c | 45 +++- fs/xfs/xfs_trans_ail.c | 28 ++- include/linux/bitmap.h | 9 +- include/linux/futex.h | 8 - include/linux/inetdevice.h | 4 +- include/linux/kvm_host.h | 1 + include/linux/memory_hotplug.h | 1 + include/linux/mfd/intel_soc_pmic.h | 1 + include/linux/mfd/max8997.h | 1 - include/linux/mfd/mc13xxx.h | 1 + kernel/Makefile | 3 - kernel/auditsc.c | 2 +- kernel/bpf/btf.c | 55 +++-- kernel/bpf/devmap.c | 3 +- kernel/dma/swiotlb.c | 33 +-- kernel/futex.c | 247 ++++++++++++++++++++- kernel/futex_compat.c | 202 ----------------- kernel/irq/matrix.c | 2 +- kernel/panic.c | 2 +- kernel/printk/printk.c | 12 +- kernel/sched/fair.c | 13 +- kernel/sched/topology.c | 2 +- lib/bitmap.c | 10 +- mm/gup_benchmark.c | 3 + mm/ksm.c | 14 +- mm/memcontrol.c | 2 +- mm/memory_hotplug.c | 76 +++++-- mm/migrate.c | 25 ++- mm/page-writeback.c | 33 ++- mm/page_io.c | 7 +- net/core/dev.c | 2 +- net/core/net-sysfs.c | 24 +- net/core/rtnetlink.c | 23 +- net/core/sock.c | 7 +- net/ipv4/igmp.c | 53 +++-- net/ipv4/ip_sockglue.c | 6 +- net/ipv6/tcp_ipv6.c | 3 +- net/openvswitch/conntrack.c | 3 +- net/sched/act_pedit.c | 12 +- net/sched/act_tunnel_key.c | 4 + net/sctp/socket.c | 38 +--- net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + net/sunrpc/xprtsock.c | 34 +-- net/unix/af_unix.c | 2 + net/vmw_vsock/virtio_transport_common.c | 15 +- net/wireless/ap.c | 2 + net/wireless/core.h | 2 + net/wireless/sme.c | 8 +- sound/firewire/isight.c | 10 +- sound/i2c/cs8427.c | 2 +- sound/soc/tegra/tegra_sgtl5000.c | 17 +- sound/usb/mixer.c | 3 + tools/bpf/bpftool/bash-completion/bpftool | 2 +- tools/bpf/bpftool/common.c | 15 +- tools/bpf/bpftool/main.h | 2 +- tools/gpio/Build | 1 + tools/gpio/Makefile | 10 +- tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk | 4 +- tools/power/acpi/tools/acpidump/apmain.c | 2 +- tools/power/x86/turbostat/turbostat.c | 93 +++++--- tools/testing/selftests/bpf/test_libbpf.sh | 2 +- tools/testing/selftests/bpf/trace_helpers.c | 1 + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 + tools/testing/selftests/kvm/dirty_log_test.c | 4 +- .../testing/selftests/powerpc/cache_shape/Makefile | 9 +- tools/testing/selftests/powerpc/ptrace/Makefile | 13 +- tools/testing/selftests/powerpc/signal/Makefile | 11 +- .../selftests/powerpc/switch_endian/Makefile | 1 + tools/testing/selftests/proc/fd-001-lookup.c | 2 +- tools/testing/selftests/proc/fd-003-kthread.c | 2 +- tools/testing/selftests/vm/gup_benchmark.c | 1 + tools/testing/selftests/watchdog/watchdog-test.c | 16 +- tools/testing/selftests/x86/mov_ss_trap.c | 3 +- tools/testing/selftests/x86/sigreturn.c | 13 ++ tools/usb/usbip/libsrc/usbip_host_common.c | 8 +- virt/kvm/kvm_main.c | 26 ++- 347 files changed, 3163 insertions(+), 1630 deletions(-)

4 years, 8 months

15
358
0 0

[PATCH] jffs2: Fix integer underflow in jffs2_rtime_compress

by Richard Weinberger

The rtime compressor assumes that at least two bytes are compressed. If we try to compress just one byte, the loop condition will wrap around and an out-of-bounds write happens. Cc: <stable(a)vger.kernel.org> Signed-off-by: Richard Weinberger <richard(a)nod.at> --- fs/jffs2/compr_rtime.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c index 406d9cc84ba8..cbf700001fc9 100644 --- a/fs/jffs2/compr_rtime.c +++ b/fs/jffs2/compr_rtime.c @@ -39,6 +39,9 @@ static int jffs2_rtime_compress(unsigned char *data_in, memset(positions,0,sizeof(positions)); + if (*dstlen < 2) + return -1; + while (pos < (*sourcelen) && outpos <= (*dstlen)-2) { int backpos, runlen=0; unsigned char value; -- 2.20.0

4 years, 9 months

2
3
0 0

[PATCH] iwlwifi: mvm: don't send the IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues

by Emmanuel Grumbach

The purpose of this was to keep all the queues updated with the Rx sequence numbers because unlikely yet possible situations where queues can't understand if a specific packet needs to be dropped or not. Unfortunately, it was reported that this caused issues in our DMA engine. We don't fully understand how this is related, but this is being currently debugged. For now, just don't send this notification to the Rx queues. This de-facto reverts my commit 3c514bf831ac12356b695ff054bef641b9e99593: iwlwifi: mvm: add a loose synchronization of the NSSN across Rx queues This issue was reported here: https://bugzilla.kernel.org/show_bug.cgi?id=204873 https://bugzilla.kernel.org/show_bug.cgi?id=205001 and others maybe. Fixes: 3c514bf831ac ("iwlwifi: mvm: add a loose synchronization of the NSSN across Rx queues") CC: <stable(a)vger.kernel.org> # 5.3+ Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach(a)intel.com> --- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index 75a7af5ad7b2..8925fe5976cb 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -521,7 +521,11 @@ static void iwl_mvm_sync_nssn(struct iwl_mvm *mvm, u8 baid, u16 nssn) .nssn_sync.nssn = nssn, }; - iwl_mvm_sync_rx_queues_internal(mvm, (void *)&notif, sizeof(notif)); + /* + * This allow to synchronize the queues, but it has been reported + * to cause FH issues. Don't send the notification for now. + * iwl_mvm_sync_rx_queues_internal(mvm, (void *)&notif, sizeof(notif)); + */ } #define RX_REORDER_BUF_TIMEOUT_MQ (HZ / 10) -- 2.17.1

4 years, 9 months

3
9
0 0

[PATCH RESEND RESEND] media: uvc: Avoid cyclic entity chains due to malformed USB descriptors

by Will Deacon

Way back in 2017, fuzzing the 4.14-rc2 USB stack with syzkaller kicked up the following WARNING from the UVC chain scanning code: | list_add double add: new=ffff880069084010, prev=ffff880069084010, | next=ffff880067d22298. | ------------[ cut here ]------------ | WARNING: CPU: 1 PID: 1846 at lib/list_debug.c:31 __list_add_valid+0xbd/0xf0 | Modules linked in: | CPU: 1 PID: 1846 Comm: kworker/1:2 Not tainted | 4.14.0-rc2-42613-g1488251d1a98 #238 | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 | Workqueue: usb_hub_wq hub_event | task: ffff88006b01ca40 task.stack: ffff880064358000 | RIP: 0010:__list_add_valid+0xbd/0xf0 lib/list_debug.c:29 | RSP: 0018:ffff88006435ddd0 EFLAGS: 00010286 | RAX: 0000000000000058 RBX: ffff880067d22298 RCX: 0000000000000000 | RDX: 0000000000000058 RSI: ffffffff85a58800 RDI: ffffed000c86bbac | RBP: ffff88006435dde8 R08: 1ffff1000c86ba52 R09: 0000000000000000 | R10: 0000000000000002 R11: 0000000000000000 R12: ffff880069084010 | R13: ffff880067d22298 R14: ffff880069084010 R15: ffff880067d222a0 | FS: 0000000000000000(0000) GS:ffff88006c900000(0000) knlGS:0000000000000000 | CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 | CR2: 0000000020004ff2 CR3: 000000006b447000 CR4: 00000000000006e0 | Call Trace: | __list_add ./include/linux/list.h:59 | list_add_tail+0x8c/0x1b0 ./include/linux/list.h:92 | uvc_scan_chain_forward.isra.8+0x373/0x416 | drivers/media/usb/uvc/uvc_driver.c:1471 | uvc_scan_chain drivers/media/usb/uvc/uvc_driver.c:1585 | uvc_scan_device drivers/media/usb/uvc/uvc_driver.c:1769 | uvc_probe+0x77f2/0x8f00 drivers/media/usb/uvc/uvc_driver.c:2104 Looking into the output from usbmon, the interesting part is the following data packet: ffff880069c63e00 30710169 C Ci:1:002:0 0 143 = 09028f00 01030080 00090403 00000e01 00000924 03000103 7c003328 010204db If we drop the lead configuration and interface descriptors, we're left with an output terminal descriptor describing a generic display: /* Output terminal descriptor */ buf[0] 09 buf[1] 24 buf[2] 03 /* UVC_VC_OUTPUT_TERMINAL */ buf[3] 00 /* ID */ buf[4] 01 /* type == 0x0301 (UVC_OTT_DISPLAY) */ buf[5] 03 buf[6] 7c buf[7] 00 /* source ID refers to self! */ buf[8] 33 The problem with this descriptor is that it is self-referential: the source ID of 0 matches itself! This causes the 'struct uvc_entity' representing the display to be added to its chain list twice during 'uvc_scan_chain()': once via 'uvc_scan_chain_entity()' when it is processed directly from the 'dev->entities' list and then again immediately afterwards when trying to follow the source ID in 'uvc_scan_chain_forward()' Add a check before adding an entity to a chain list to ensure that the entity is not already part of a chain. Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Dmitry Vyukov <dvyukov(a)google.com> Cc: Kostya Serebryany <kcc(a)google.com> Cc: <stable(a)vger.kernel.org> Fixes: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") Reported-by: Andrey Konovalov <andreyknvl(a)google.com> Link: https://lore.kernel.org/linux-media/CAAeHK+z+Si69jUR+N-SjN9q4O+o5KFiNManqEa… Signed-off-by: Will Deacon <will(a)kernel.org> --- That's right, it's the same patch again! No changes since either of: http://lkml.kernel.org/r/20191002112753.21630-1-will@kernel.org https://lore.kernel.org/lkml/20191016195800.22099-1-will@kernel.org Please consider merging. drivers/media/usb/uvc/uvc_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 66ee168ddc7e..e24420b1750a 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1493,6 +1493,11 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, break; if (forward == prev) continue; + if (forward->chain.next || forward->chain.prev) { + uvc_trace(UVC_TRACE_DESCR, "Found reference to " + "entity %d already in chain.\n", forward->id); + return -EINVAL; + } switch (UVC_ENTITY_TYPE(forward)) { case UVC_VC_EXTENSION_UNIT: @@ -1574,6 +1579,13 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, return -1; } + if (term->chain.next || term->chain.prev) { + uvc_trace(UVC_TRACE_DESCR, "Found reference to " + "entity %d already in chain.\n", + term->id); + return -EINVAL; + } + if (uvc_trace_param & UVC_TRACE_PROBE) printk(KERN_CONT " %d", term->id); -- 2.24.0.rc1.363.gb1bccd3e3d-goog

4 years, 9 months

4
12
0 0

[PATCH 2/3] genirq/irqdomain: Re-check mapping after associate in irq_create_mapping()

by Sverdlin, Alexander (Nokia - DE/Ulm)

From: Alexander Sverdlin <alexander.sverdlin(a)nokia.com> If two irq_create_mapping() calls perform a mapping of the same hwirq on two CPU cores in parallel they both will get 0 from irq_find_mapping(), both will allocate unique virq using irq_domain_alloc_descs() and both will finally irq_domain_associate() it. Giving different virq numbers to their callers. In practice the first caller is usually an interrupt controller driver and the seconds is some device requesting the interrupt providede by the above interrupt controller. In this case either the interrupt controller driver configures virq which is not the one being "associated" with hwirq, or the "slave" device requests the virq which is never being triggered. Cc: stable(a)vger.kernel.org Signed-off-by: Alexander Sverdlin <alexander.sverdlin(a)nokia.com> --- kernel/irq/irqdomain.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 7bc07b6..176f2cc 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -675,13 +675,6 @@ unsigned int irq_create_mapping(struct irq_domain *domain, of_node = irq_domain_get_of_node(domain); - /* Check if mapping already exists */ - virq = irq_find_mapping(domain, hwirq); - if (virq) { - pr_debug("-> existing mapping on virq %d\n", virq); - return virq; - } - /* Allocate a virtual interrupt number */ virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), NULL); if (virq <= 0) { @@ -691,7 +684,11 @@ unsigned int irq_create_mapping(struct irq_domain *domain, if (irq_domain_associate(domain, virq, hwirq)) { irq_free_desc(virq); - return 0; + + virq = irq_find_mapping(domain, hwirq); + if (virq) + pr_debug("-> existing mapping on virq %d\n", virq); + return virq; } pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", -- 2.4.6

4 years, 9 months

3
3
0 0

Please backport "mwifiex: Fix NL80211_TX_POWER_LIMITED" to stable branches

by Adrian Bunk

Please backport commit 65a576e27309120e0621f54d5c81eb9128bd56be "mwifiex: Fix NL80211_TX_POWER_LIMITED" to stable branches. It is a non-CVE kind of security issue when a wifi adapter exceeds the configured TX power limit. The commit applies and builds against all branches from 3.16 to 4.19, confirmed working with 4.14. It is already included in kernel 5.3. Thanks in advance Adrian

4 years, 9 months

3
2
0 0

[PATCH][STABLE backport 4.4] dmaengine: qcom: bam_dma: Fix resource leak

by Jeffrey Hugo

Commit 7667819385457b4aeb5fac94f67f52ab52cc10d5 upstream. bam_dma_terminate_all() will leak resources if any of the transactions are committed to the hardware (present in the desc fifo), and not complete. Since bam_dma_terminate_all() does not cause the hardware to be updated, the hardware will still operate on any previously committed transactions. This can cause memory corruption if the memory for the transaction has been reassigned, and will cause a sync issue between the BAM and its client(s). Fix this by properly updating the hardware in bam_dma_terminate_all(). Fixes: e7c0fe2a5c84 ("dmaengine: add Qualcomm BAM dma driver") Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo(a)gmail.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20191017152606.34120-1-jeffrey.l.hugo@gmail.com Signed-off-by: Vinod Koul <vkoul(a)kernel.org> --- Backported to 4.4 which is lacking 6b4faeac05bc ("dmaengine: qcom-bam: Process multiple pending descriptors") --- drivers/dma/qcom_bam_dma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c index 5a250cdc8376..eca5b106d7d4 100644 --- a/drivers/dma/qcom_bam_dma.c +++ b/drivers/dma/qcom_bam_dma.c @@ -671,7 +671,21 @@ static int bam_dma_terminate_all(struct dma_chan *chan) /* remove all transactions, including active transaction */ spin_lock_irqsave(&bchan->vc.lock, flag); + /* + * If we have transactions queued, then some might be committed to the + * hardware in the desc fifo. The only way to reset the desc fifo is + * to do a hardware reset (either by pipe or the entire block). + * bam_chan_init_hw() will trigger a pipe reset, and also reinit the + * pipe. If the pipe is left disabled (default state after pipe reset) + * and is accessed by a connected hardware engine, a fatal error in + * the BAM will occur. There is a small window where this could happen + * with bam_chan_init_hw(), but it is assumed that the caller has + * stopped activity on any attached hardware engine. Make sure to do + * this first so that the BAM hardware doesn't cause memory corruption + * by accessing freed resources. + */ if (bchan->curr_txd) { + bam_chan_init_hw(bchan, bchan->curr_txd->dir); list_add(&bchan->curr_txd->vd.node, &bchan->vc.desc_issued); bchan->curr_txd = NULL; } -- 2.17.1

4 years, 9 months

2
1
0 0

[PATCH for 5.4 0/3] Restartable Sequences Fixes

by Mathieu Desnoyers

Hi, Here is a small set of rseq fixes aiming Linux 5.4. Those should be backported to stable kernels >= 4.18. Thanks, Mathieu Mathieu Desnoyers (3): rseq: Fix: Reject unknown flags on rseq unregister rseq: Fix: Unregister rseq for clone CLONE_VM rseq/selftests: Fix: Namespace gettid() for compatibility with glibc 2.30 include/linux/sched.h | 4 ++-- kernel/rseq.c | 2 ++ tools/testing/selftests/rseq/param_test.c | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) -- 2.17.1

4 years, 10 months

2
6
0 0

[PATCH v3] power/supply: ingenic-battery: Don't change scale if there's only one

by Paul Cercueil

The ADC in the JZ4740 can work either in high-precision mode with a 2.5V range, or in low-precision mode with a 7.5V range. The code in place in this driver will select the proper scale according to the maximum voltage of the battery. The JZ4770 however only has one mode, with a 6.6V range. If only one scale is available, there's no need to change it (and nothing to change it to), and trying to do so will fail with -EINVAL. Fixes: fb24ccfbe1e0 ("power: supply: add Ingenic JZ47xx battery driver.") Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> Cc: stable(a)vger.kernel.org --- Notes: v2: Rebased on v5.4-rc7 v3: Move code after check for max scale voltage drivers/power/supply/ingenic-battery.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/power/supply/ingenic-battery.c b/drivers/power/supply/ingenic-battery.c index 35816d4b3012..2748715c4c75 100644 --- a/drivers/power/supply/ingenic-battery.c +++ b/drivers/power/supply/ingenic-battery.c @@ -100,10 +100,17 @@ static int ingenic_battery_set_scale(struct ingenic_battery *bat) return -EINVAL; } - return iio_write_channel_attribute(bat->channel, - scale_raw[best_idx], - scale_raw[best_idx + 1], - IIO_CHAN_INFO_SCALE); + /* Only set scale if there is more than one (fractional) entry */ + if (scale_len > 2) { + ret = iio_write_channel_attribute(bat->channel, + scale_raw[best_idx], + scale_raw[best_idx + 1], + IIO_CHAN_INFO_SCALE); + if (ret) + return ret; + } + + return 0; } static enum power_supply_property ingenic_battery_properties[] = { -- 2.24.0

4 years, 10 months

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2019