October 2020 - Linux-stable-mirror

patch "USB: apple-mfi-fastcharge: don't probe unhandled devices" 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: apple-mfi-fastcharge: don't probe unhandled devices 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 0cb686692fd200db12dcfb8231e793c1c98aec41 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Thu, 22 Oct 2020 09:55:21 -0400 Subject: USB: apple-mfi-fastcharge: don't probe unhandled devices From: Bastien Nocera <hadess(a)hadess.net> Contrary to the comment above the id table, we didn't implement a match function. This meant that every single Apple device that was already plugged in to the computer would have its device driver reprobed when the apple-mfi-fastcharge driver was loaded, eg. the SD card reader could be reprobed when the apple-mfi-fastcharge after pivoting root during boot up and the module became available. Make sure that the driver probe isn't being run for unsupported devices by adding a match function that checks the product ID, in addition to the id_table checking the vendor ID. Link: https://bugzilla.redhat.com/show_bug.cgi?id=1878347 Link: https://lore.kernel.org/linux-usb/CAE3RAxt0WhBEz8zkHrVO5RiyEOasayy1QUAjsv-p… Fixes: 249fa8217b84 ("USB: Add driver to control USB fast charge for iOS devices") Cc: <stable(a)vger.kernel.org> # 5.8 Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Alan Stern <stern(a)rowland.harvard.edu> [m.v.b: Add Link and Reported-by tags to the commit message] Reported-by: Pany <pany(a)fedoraproject.org> Tested-by: Pan (Pany) YUAN <pany(a)fedoraproject.org> Tested-by: Bastien Nocera <hadess(a)hadess.net> Signed-off-by: Bastien Nocera <hadess(a)hadess.net> Signed-off-by: M. Vefa Bicakci <m.v.b(a)runbox.com> Link: https://lore.kernel.org/r/20201022135521.375211-3-m.v.b@runbox.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/misc/apple-mfi-fastcharge.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/usb/misc/apple-mfi-fastcharge.c b/drivers/usb/misc/apple-mfi-fastcharge.c index b403094a6b3a..579d8c84de42 100644 --- a/drivers/usb/misc/apple-mfi-fastcharge.c +++ b/drivers/usb/misc/apple-mfi-fastcharge.c @@ -163,17 +163,23 @@ static const struct power_supply_desc apple_mfi_fc_desc = { .property_is_writeable = apple_mfi_fc_property_is_writeable }; +static bool mfi_fc_match(struct usb_device *udev) +{ + int idProduct; + + idProduct = le16_to_cpu(udev->descriptor.idProduct); + /* See comment above mfi_fc_id_table[] */ + return (idProduct >= 0x1200 && idProduct <= 0x12ff); +} + static int mfi_fc_probe(struct usb_device *udev) { struct power_supply_config battery_cfg = {}; struct mfi_device *mfi = NULL; - int err, idProduct; + int err; - idProduct = le16_to_cpu(udev->descriptor.idProduct); - /* See comment above mfi_fc_id_table[] */ - if (idProduct < 0x1200 || idProduct > 0x12ff) { + if (!mfi_fc_match(udev)) return -ENODEV; - } mfi = kzalloc(sizeof(struct mfi_device), GFP_KERNEL); if (!mfi) { @@ -220,6 +226,7 @@ static struct usb_device_driver mfi_fc_driver = { .probe = mfi_fc_probe, .disconnect = mfi_fc_disconnect, .id_table = mfi_fc_id_table, + .match = mfi_fc_match, .generic_subclass = 1, }; -- 2.29.1

4 years, 3 months

1
0
0 0

patch "usbcore: Check both id_table and match() when both available" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usbcore: Check both id_table and match() when both available 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 0942d59b0af46511d59dbf5bd69ec4a64d1a854c Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess(a)hadess.net> Date: Thu, 22 Oct 2020 09:55:20 -0400 Subject: usbcore: Check both id_table and match() when both available From: Bastien Nocera <hadess(a)hadess.net> When a USB device driver has both an id_table and a match() function, make sure to check both to find a match, first matching the id_table, then checking the match() function. This makes it possible to have module autoloading done through the id_table when devices are plugged in, before checking for further device eligibility in the match() function. Cc: <stable(a)vger.kernel.org> # 5.8 Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Alan Stern <stern(a)rowland.harvard.edu> Co-developed-by: M. Vefa Bicakci <m.v.b(a)runbox.com> Tested-by: Bastien Nocera <hadess(a)hadess.net> Signed-off-by: Bastien Nocera <hadess(a)hadess.net> Signed-off-by: M. Vefa Bicakci <m.v.b(a)runbox.com> Tested-by: Pan (Pany) YUAN <pany(a)fedoraproject.org> Link: https://lore.kernel.org/r/20201022135521.375211-2-m.v.b@runbox.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/core/driver.c | 30 +++++++++++++++++++++--------- drivers/usb/core/generic.c | 4 +--- drivers/usb/core/usb.h | 2 ++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 98b7449c11f3..4dfa44d6cc3c 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -839,6 +839,22 @@ const struct usb_device_id *usb_device_match_id(struct usb_device *udev, return NULL; } +bool usb_driver_applicable(struct usb_device *udev, + struct usb_device_driver *udrv) +{ + if (udrv->id_table && udrv->match) + return usb_device_match_id(udev, udrv->id_table) != NULL && + udrv->match(udev); + + if (udrv->id_table) + return usb_device_match_id(udev, udrv->id_table) != NULL; + + if (udrv->match) + return udrv->match(udev); + + return false; +} + static int usb_device_match(struct device *dev, struct device_driver *drv) { /* devices and interfaces are handled separately */ @@ -853,17 +869,14 @@ static int usb_device_match(struct device *dev, struct device_driver *drv) udev = to_usb_device(dev); udrv = to_usb_device_driver(drv); - if (udrv->id_table) - return usb_device_match_id(udev, udrv->id_table) != NULL; - - if (udrv->match) - return udrv->match(udev); - /* If the device driver under consideration does not have a * id_table or a match function, then let the driver's probe * function decide. */ - return 1; + if (!udrv->id_table && !udrv->match) + return 1; + + return usb_driver_applicable(udev, udrv); } else if (is_usb_interface(dev)) { struct usb_interface *intf; @@ -941,8 +954,7 @@ static int __usb_bus_reprobe_drivers(struct device *dev, void *data) return 0; udev = to_usb_device(dev); - if (usb_device_match_id(udev, new_udriver->id_table) == NULL && - (!new_udriver->match || new_udriver->match(udev) == 0)) + if (!usb_driver_applicable(udev, new_udriver)) return 0; ret = device_reprobe(dev); diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 22c887f5c497..26f9fb9f67ca 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -205,9 +205,7 @@ static int __check_for_non_generic_match(struct device_driver *drv, void *data) udrv = to_usb_device_driver(drv); if (udrv == &usb_generic_driver) return 0; - if (usb_device_match_id(udev, udrv->id_table) != NULL) - return 1; - return (udrv->match && udrv->match(udev)); + return usb_driver_applicable(udev, udrv); } static bool usb_generic_driver_match(struct usb_device *udev) diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index c893f54a3420..82538daac8b8 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -74,6 +74,8 @@ extern int usb_match_device(struct usb_device *dev, const struct usb_device_id *id); extern const struct usb_device_id *usb_device_match_id(struct usb_device *udev, const struct usb_device_id *id); +extern bool usb_driver_applicable(struct usb_device *udev, + struct usb_device_driver *udrv); extern void usb_forced_unbind_intf(struct usb_interface *intf); extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev); -- 2.29.1

4 years, 3 months

1
0
0 0

patch "usb: cdc-acm: fix cooldown mechanism" 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: cdc-acm: fix cooldown mechanism 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 38203b8385bf6283537162bde7d499f830964711 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet(a)baylibre.com> Date: Mon, 19 Oct 2020 19:07:02 +0200 Subject: usb: cdc-acm: fix cooldown mechanism Commit a4e7279cd1d1 ("cdc-acm: introduce a cool down") is causing regression if there is some USB error, such as -EPROTO. This has been reported on some samples of the Odroid-N2 using the Combee II Zibgee USB dongle. > struct acm *acm = container_of(work, struct acm, work) is incorrect in case of a delayed work and causes warnings, usually from the workqueue: > WARNING: CPU: 0 PID: 0 at kernel/workqueue.c:1474 __queue_work+0x480/0x528. When this happens, USB eventually stops working completely after a while. Also the ACM_ERROR_DELAY bit is never set, so the cooldown mechanism previously introduced cannot be triggered and acm_submit_read_urb() is never called. This changes makes the cdc-acm driver use a single delayed work, fixing the pointer arithmetic in acm_softint() and set the ACM_ERROR_DELAY when the cooldown mechanism appear to be needed. Fixes: a4e7279cd1d1 ("cdc-acm: introduce a cool down") Cc: Oliver Neukum <oneukum(a)suse.com> Reported-by: Pascal Vizeli <pascal.vizeli(a)nabucasa.com> Acked-by: Oliver Neukum <oneukum(a)suse.com> Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> Link: https://lore.kernel.org/r/20201019170702.150534-1-jbrunet@baylibre.com Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/class/cdc-acm.c | 12 +++++------- drivers/usb/class/cdc-acm.h | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 30ef946a8e1a..1e7568867910 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -508,6 +508,7 @@ static void acm_read_bulk_callback(struct urb *urb) "%s - cooling babbling device\n", __func__); usb_mark_last_busy(acm->dev); set_bit(rb->index, &acm->urbs_in_error_delay); + set_bit(ACM_ERROR_DELAY, &acm->flags); cooldown = true; break; default: @@ -533,7 +534,7 @@ static void acm_read_bulk_callback(struct urb *urb) if (stopped || stalled || cooldown) { if (stalled) - schedule_work(&acm->work); + schedule_delayed_work(&acm->dwork, 0); else if (cooldown) schedule_delayed_work(&acm->dwork, HZ / 2); return; @@ -563,13 +564,13 @@ static void acm_write_bulk(struct urb *urb) acm_write_done(acm, wb); spin_unlock_irqrestore(&acm->write_lock, flags); set_bit(EVENT_TTY_WAKEUP, &acm->flags); - schedule_work(&acm->work); + schedule_delayed_work(&acm->dwork, 0); } static void acm_softint(struct work_struct *work) { int i; - struct acm *acm = container_of(work, struct acm, work); + struct acm *acm = container_of(work, struct acm, dwork.work); if (test_bit(EVENT_RX_STALL, &acm->flags)) { smp_mb(); /* against acm_suspend() */ @@ -585,7 +586,7 @@ static void acm_softint(struct work_struct *work) if (test_and_clear_bit(ACM_ERROR_DELAY, &acm->flags)) { for (i = 0; i < acm->rx_buflimit; i++) if (test_and_clear_bit(i, &acm->urbs_in_error_delay)) - acm_submit_read_urb(acm, i, GFP_NOIO); + acm_submit_read_urb(acm, i, GFP_KERNEL); } if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags)) @@ -1351,7 +1352,6 @@ static int acm_probe(struct usb_interface *intf, acm->ctrlsize = ctrlsize; acm->readsize = readsize; acm->rx_buflimit = num_rx_buf; - INIT_WORK(&acm->work, acm_softint); INIT_DELAYED_WORK(&acm->dwork, acm_softint); init_waitqueue_head(&acm->wioctl); spin_lock_init(&acm->write_lock); @@ -1561,7 +1561,6 @@ static void acm_disconnect(struct usb_interface *intf) } acm_kill_urbs(acm); - cancel_work_sync(&acm->work); cancel_delayed_work_sync(&acm->dwork); tty_unregister_device(acm_tty_driver, acm->minor); @@ -1604,7 +1603,6 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message) return 0; acm_kill_urbs(acm); - cancel_work_sync(&acm->work); cancel_delayed_work_sync(&acm->dwork); acm->urbs_in_error_delay = 0; diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 9dce179d031b..8aef5eb769a0 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -112,8 +112,7 @@ struct acm { # define ACM_ERROR_DELAY 3 unsigned long urbs_in_error_delay; /* these need to be restarted after a delay */ struct usb_cdc_line_coding line; /* bits, stop, parity */ - struct work_struct work; /* work queue entry for various purposes*/ - struct delayed_work dwork; /* for cool downs needed in error recovery */ + struct delayed_work dwork; /* work queue entry for various purposes */ unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */ unsigned int ctrlout; /* output control lines (DTR, RTS) */ struct async_icount iocount; /* counters for control line changes */ -- 2.29.1

4 years, 3 months

1
0
0 0

patch "usb: host: fsl-mph-dr-of: check return of dma_set_mask()" 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: host: fsl-mph-dr-of: check return of dma_set_mask() 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 3cd54a618834430a26a648d880dd83d740f2ae30 Mon Sep 17 00:00:00 2001 From: Ran Wang <ran.wang_1(a)nxp.com> Date: Sat, 10 Oct 2020 14:03:08 +0800 Subject: usb: host: fsl-mph-dr-of: check return of dma_set_mask() fsl_usb2_device_register() should stop init if dma_set_mask() return error. Fixes: cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device") Reviewed-by: Peter Chen <peter.chen(a)nxp.com> Signed-off-by: Ran Wang <ran.wang_1(a)nxp.com> Link: https://lore.kernel.org/r/20201010060308.33693-1-ran.wang_1@nxp.com Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index ae8f60f6e6a5..44a7e58a26e3 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -94,10 +94,13 @@ static struct platform_device *fsl_usb2_device_register( pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask; - if (!pdev->dev.dma_mask) + if (!pdev->dev.dma_mask) { pdev->dev.dma_mask = &ofdev->dev.coherent_dma_mask; - else - dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + } else { + retval = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + if (retval) + goto error; + } retval = platform_device_add_data(pdev, pdata, sizeof(*pdata)); if (retval) -- 2.29.1

4 years, 3 months

1
0
0 0

[PATCH 4.14 000/191] 4.14.203-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.203 release. There are 191 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, 29 Oct 2020 13:48:36 +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.14.203-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.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.14.203-rc1 Lorenzo Colitti <lorenzo(a)google.com> usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets. Christian Eggers <ceggers(a)arri.de> eeprom: at25: set minimum read/write access stride to 1 Oliver Neukum <oneukum(a)suse.com> USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync(). Vincent Mailhol <mailhol.vincent(a)wanadoo.fr> usb: cdc-acm: add quirk to blacklist ETAS ES58X devices Peng Fan <peng.fan(a)nxp.com> tty: serial: fsl_lpuart: fix lpuart32_poll_get_char Valentin Vidic <vvidic(a)valentin-vidic.from.hr> net: korina: cast KSEG0 address to pointer in kfree Zekun Shen <bruceshenzk(a)gmail.com> ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n() Can Guo <cang(a)codeaurora.org> scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config() Eli Billauer <eli.billauer(a)gmail.com> usb: core: Solve race condition in anchor cleanup functions Wang Yufen <wangyufen(a)huawei.com> brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mwifiex: don't call del_timer_sync() on uninitialized timer Jan Kara <jack(a)suse.cz> reiserfs: Fix memory leak in reiserfs_parse_options() Peilin Ye <yepeilin.cs(a)gmail.com> ipvs: Fix uninit-value in do_ip_vs_set_ctl() Tong Zhang <ztong0001(a)gmail.com> tty: ipwireless: fix error handling Nilesh Javali <njavali(a)marvell.com> scsi: qedi: Fix list_del corruption while removing active I/O Nilesh Javali <njavali(a)marvell.com> scsi: qedi: Protect active command list to avoid list corruption Doug Horn <doughorn(a)google.com> Fix use after free in get_capset_info callback. Chris Chiu <chiu(a)endlessm.com> rtl8xxxu: prevent potential memory leak Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> brcmsmac: fix memory leak in wlc_phy_attach_lcnphy Jing Xiangfeng <jingxiangfeng(a)huawei.com> scsi: ibmvfc: Fix error return in ibmvfc_probe() Abhishek Pandit-Subedi <abhishekpandit(a)chromium.org> Bluetooth: Only mark socket zapped after unlocking Hamish Martin <hamish.martin(a)alliedtelesis.co.nz> usb: ohci: Default to per-port over-current protection Darrick J. Wong <darrick.wong(a)oracle.com> xfs: make sure the rt allocator doesn't run off the end Eric Biggers <ebiggers(a)google.com> reiserfs: only call unlock_new_inode() if I_NEW Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> misc: rtsx: Fix memory leak in rtsx_pci_probe Brooke Basile <brookebasile(a)gmail.com> ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs() Joakim Zhang <qiangqing.zhang(a)nxp.com> can: flexcan: flexcan_chip_stop(): add error handling and propagate error value Johan Hovold <johan(a)kernel.org> USB: cdc-acm: handle broken union descriptors Jan Kara <jack(a)suse.cz> udf: Avoid accessing uninitialized data on failed inode read Jan Kara <jack(a)suse.cz> udf: Limit sparing table size Zqiang <qiang.zhang(a)windriver.com> usb: gadget: function: printer: fix use-after-free in __lock_acquire Sherry Sun <sherry.sun(a)nxp.com> misc: vop: add round_up(x,4) for vring_size to avoid kernel panic Sherry Sun <sherry.sun(a)nxp.com> mic: vop: copy data to kernel space then write to io memory Roman Bolshakov <r.bolshakov(a)yadro.com> scsi: target: core: Add CONTROL field for trace events Jing Xiangfeng <jingxiangfeng(a)huawei.com> scsi: mvumi: Fix error return in mvumi_io_attach() Christoph Hellwig <hch(a)lst.de> PM: hibernate: remove the bogus call to get_gendisk() in software_resume() Thomas Pedersen <thomas(a)adapt-ip.com> mac80211: handle lack of sband->bitrates in rates Rustam Kovhaev <rkovhaev(a)gmail.com> ntfs: add check for mft record size in superblock Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: venus: core: Fix runtime PM imbalance in venus_probe Alexander Aring <aahringo(a)redhat.com> fs: dlm: fix configfs memory leak Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> media: saa7134: avoid a shift overflow Pali Rohár <pali(a)kernel.org> mmc: sdio: Check for CISTPL_VERS_1 buffer size Adam Goode <agoode(a)google.com> media: uvcvideo: Ensure all probed info is returned to v4l2 Xiaolong Huang <butterflyhuangxx(a)gmail.com> media: media/pci: prevent memory leak in bttv_probe Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: bdisp: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: platform: sti: hva: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: platform: s3c-camif: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: vsp1: Fix runtime PM imbalance on error Qiushi Wu <wu000273(a)umn.edu> media: exynos4-is: Fix a reference count leak Qiushi Wu <wu000273(a)umn.edu> media: exynos4-is: Fix a reference count leak due to pm_runtime_get_sync Qiushi Wu <wu000273(a)umn.edu> media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync Qiushi Wu <wu000273(a)umn.edu> media: sti: Fix reference count leaks Aditya Pakki <pakki001(a)umn.edu> media: st-delta: Fix reference count leak in delta_run_work Oliver Neukum <oneukum(a)suse.com> media: ati_remote: sanity check for both endpoints Pavel Machek <pavel(a)ucw.cz> media: firewire: fix memory leak Pavel Machek <pavel(a)denx.de> crypto: ccp - fix error handling Hans de Goede <hdegoede(a)redhat.com> i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs Al Grant <al.grant(a)foss.arm.com> perf: correct SNOOPX field offset Kaige Li <likaige(a)loongson.cn> NTB: hw: amd: fix an issue about leak system resources zhenwei pi <pizhenwei(a)bytedance.com> nvmet: fix uninitialized work for zero kato Vasant Hegde <hegdevasant(a)linux.vnet.ibm.com> powerpc/powernv/dump: Fix race while processing OPAL dump Michal Simek <michal.simek(a)xilinx.com> arm64: dts: zynqmp: Remove additional compatible string for i2c IPs Cristian Ciocaltea <cristian.ciocaltea(a)gmail.com> ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers Stephan Gerhold <stephan(a)gerhold.net> arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts Krzysztof Kozlowski <krzk(a)kernel.org> memory: fsl-corenet-cf: Fix handling of platform_get_irq() error Dan Carpenter <dan.carpenter(a)oracle.com> memory: omap-gpmc: Fix a couple off by ones Robert Hoo <robert.hu(a)linux.intel.com> KVM: x86: emulating RDPID failure shall return #UD rather than #GP Krzysztof Kozlowski <krzk(a)kernel.org> Input: sun4i-ps2 - fix handling of platform_get_irq() error Krzysztof Kozlowski <krzk(a)kernel.org> Input: twl4030_keypad - fix handling of platform_get_irq() error Krzysztof Kozlowski <krzk(a)kernel.org> Input: omap4-keypad - fix handling of platform_get_irq() error Krzysztof Kozlowski <krzk(a)kernel.org> Input: ep93xx_keypad - fix handling of platform_get_irq() error YueHaibing <yuehaibing(a)huawei.com> Input: stmfts - fix a & vs && typo Dan Carpenter <dan.carpenter(a)oracle.com> Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() Xiaoyang Xu <xuxiaoyang2(a)huawei.com> vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages Alex Williamson <alex.williamson(a)redhat.com> vfio/pci: Clear token on bypass registration failure Darrick J. Wong <darrick.wong(a)oracle.com> ext4: limit entries returned when counting fsmap records Navid Emamdoost <navid.emamdoost(a)gmail.com> clk: bcm2835: add missing release if devm_clk_hw_register fails Claudiu Beznea <claudiu.beznea(a)microchip.com> clk: at91: clk-main: update key before writing AT91_CKGR_MOR Mark Tomlinson <mark.tomlinson(a)alliedtelesis.co.nz> PCI: iproc: Set affinity mask on MSI interrupts Dirk Behme <dirk.behme(a)de.bosch.com> i2c: rcar: Auto select RESET_CONTROLLER Jassi Brar <jaswinder.singh(a)linaro.org> mailbox: avoid timer start from callback Jing Xiangfeng <jingxiangfeng(a)huawei.com> rapidio: fix the missed put_device() for rio_mport_add_riodev Souptick Joarder <jrdr.linux(a)gmail.com> rapidio: fix error handling path Matthew Wilcox (Oracle) <willy(a)infradead.org> ramfs: fix nommu mmap with gaps in the page cache Tobias Jordan <kernel(a)cdqe.de> lib/crc32.c: fix trivial typo in preprocessor condition Jamie Iles <jamie(a)nuviainc.com> f2fs: wait for sysfs kobject removal before freeing f2fs_sb_info Colin Ian King <colin.king(a)canonical.com> IB/rdmavt: Fix sizeof mismatch Srikar Dronamraju <srikar(a)linux.vnet.ibm.com> cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier Kajol Jain <kjain(a)linux.ibm.com> powerpc/perf/hv-gpci: Fix starting index value Athira Rajeev <atrajeev(a)linux.vnet.ibm.com> powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints Leon Romanovsky <leonro(a)nvidia.com> overflow: Include header file with SIZE_MAX declaration Daniel Thompson <daniel.thompson(a)linaro.org> kdb: Fix pager search for multi-line strings Lijun Ou <oulijun(a)huawei.com> RDMA/hns: Set the unsupported wr opcode Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix "context_switch event has no tid" error Finn Thain <fthain(a)telegraphics.com.au> powerpc/tau: Disable TAU between measurements Finn Thain <fthain(a)telegraphics.com.au> powerpc/tau: Remove duplicated set_thresholds() call Finn Thain <fthain(a)telegraphics.com.au> powerpc/tau: Use appropriate temperature sample interval Michal Kalderon <michal.kalderon(a)marvell.com> RDMA/qedr: Fix use of uninitialized field Darrick J. Wong <darrick.wong(a)oracle.com> xfs: limit entries returned when counting fsmap records Necip Fazil Yildiran <fazilyildiran(a)gmail.com> arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER Guillaume Tucker <guillaume.tucker(a)collabora.com> ARM: 9007/1: l2c: fix prefetch bits init in L2X0_AUX_CTRL using DT values Mark Tomlinson <mark.tomlinson(a)alliedtelesis.co.nz> mtd: mtdoops: Don't write panic data twice Arnd Bergmann <arnd(a)arndb.de> mtd: lpddr: fix excessive stack usage with clang Nicholas Mc Guire <hofrat(a)osadl.org> powerpc/icp-hv: Fix missing of_node_put() in success path Nicholas Mc Guire <hofrat(a)osadl.org> powerpc/pseries: Fix missing of_node_put() in rng_init() Håkon Bugge <haakon.bugge(a)oracle.com> IB/mlx4: Adjust delayed work when a dup is observed Håkon Bugge <haakon.bugge(a)oracle.com> IB/mlx4: Fix starvation in paravirt mux/demux Suren Baghdasaryan <surenb(a)google.com> mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary Ralph Campbell <rcampbell(a)nvidia.com> mm/memcg: fix device private memcg accounting Valentin Vidic <vvidic(a)valentin-vidic.from.hr> net: korina: fix kfree of rx/tx descriptor array Tom Rix <trix(a)redhat.com> mwifiex: fix double free Dan Carpenter <dan.carpenter(a)oracle.com> scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs() Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> usb: dwc2: Fix INTR OUT transfers in DDMA mode. Johannes Berg <johannes.berg(a)intel.com> nl80211: fix non-split wiphy information Lorenzo Colitti <lorenzo(a)google.com> usb: gadget: u_ether: enable qmult on SuperSpeed Plus as well Lorenzo Colitti <lorenzo(a)google.com> usb: gadget: f_ncm: fix ncm_bitrate for SuperSpeed and above. Emmanuel Grumbach <emmanuel.grumbach(a)intel.com> iwlwifi: mvm: split a print to avoid a WARNING in ROC Dan Carpenter <dan.carpenter(a)oracle.com> mfd: sm501: Fix leaks in probe() Thomas Gleixner <tglx(a)linutronix.de> net: enic: Cure the enic api locking trainwreck Colin Ian King <colin.king(a)canonical.com> qtnfmac: fix resource leaks on unsupported iftype error return path Dmitry Torokhov <dmitry.torokhov(a)gmail.com> HID: hid-input: fix stylus battery reporting Eric Dumazet <edumazet(a)google.com> quota: clear padding in v2r1_mem2diskdqb() Nathan Chancellor <natechancellor(a)gmail.com> usb: dwc2: Fix parameter type in function pointer prototype Takashi Iwai <tiwai(a)suse.de> ALSA: seq: oss: Avoid mutex lock for a long-time ioctl Souptick Joarder <jrdr.linux(a)gmail.com> misc: mic: scif: Fix error handling path Dan Carpenter <dan.carpenter(a)oracle.com> ath6kl: wmi: prevent a shift wrapping bug in ath6kl_wmi_delete_pstream_cmd() Thomas Preston <thomas.preston(a)codethink.co.uk> pinctrl: mcp23s08: Fix mcp23x17 precious range Thomas Preston <thomas.preston(a)codethink.co.uk> pinctrl: mcp23s08: Fix mcp23x17_regmap initialiser Dan Carpenter <dan.carpenter(a)oracle.com> HID: roccat: add bounds checking in kone_sysfs_write_settings() Tom Rix <trix(a)redhat.com> video: fbdev: sis: fix null ptr dereference Colin Ian King <colin.king(a)canonical.com> video: fbdev: vga16fb: fix setting of pixclock because a pass-by-value error Souptick Joarder <jrdr.linux(a)gmail.com> drivers/virt/fsl_hypervisor: Fix error handling path Hans de Goede <hdegoede(a)redhat.com> pwm: lpss: Add range limit check for the base_unit register value Hans de Goede <hdegoede(a)redhat.com> pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() Artem Savkov <asavkov(a)redhat.com> pty: do tty_flip_buffer_push without port->lock in pty_write Tyrel Datwyler <tyreld(a)linux.ibm.com> tty: hvcs: Don't NULL tty->driver_data until hvcs_cleanup() Tong Zhang <ztong0001(a)gmail.com> tty: serial: earlycon dependency Alex Dewar <alex.dewar90(a)gmail.com> VMCI: check return value of get_user_pages_fast() for errors dinghao.liu(a)zju.edu.cn <dinghao.liu(a)zju.edu.cn> backlight: sky81452-backlight: Fix refcount imbalance on error Tianjia Zhang <tianjia.zhang(a)linux.alibaba.com> scsi: csiostor: Fix wrong return value in csio_hw_prep_fw() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> scsi: qla4xxx: Fix an error handling path in 'qla4xxx_get_host_stats()' Tom Rix <trix(a)redhat.com> drm/gma500: fix error check Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mwifiex: Do not use GFP_KERNEL in atomic context Tom Rix <trix(a)redhat.com> brcmfmac: check ndev pointer Rohit kumar <rohitkr(a)codeaurora.org> ASoC: qcom: lpass-cpu: fix concurrency issue Rohit kumar <rohitkr(a)codeaurora.org> ASoC: qcom: lpass-platform: fix memory leak Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> wcn36xx: Fix reported 802.11n rx_highest rate wcn3660/wcn3680 Dan Carpenter <dan.carpenter(a)oracle.com> ath9k: Fix potential out of bounds in ath9k_htc_txcompletion_cb() Dan Carpenter <dan.carpenter(a)oracle.com> ath6kl: prevent potential array overflow in ath6kl_add_new_sta() Samuel Holland <samuel(a)sholland.org> Bluetooth: hci_uart: Cancel init work before unregistering Venkateswara Naralasetty <vnaralas(a)codeaurora.org> ath10k: provide survey info as accumulated data Michał Mirosław <mirq-linux(a)rere.qmqm.pl> regulator: resolve supply after creating regulator Qiushi Wu <wu000273(a)umn.edu> media: ti-vpe: Fix a missing check and reference count leak Qiushi Wu <wu000273(a)umn.edu> media: s5p-mfc: Fix a reference count leak Qiushi Wu <wu000273(a)umn.edu> media: platform: fcp: Fix a reference count leak. Tom Rix <trix(a)redhat.com> media: tc358743: initialize variable Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: mx2_emmaprp: Fix memleak in emmaprp_probe Xiaoliang Pang <dawning.pang(a)gmail.com> cypto: mediatek - fix leaks in mtk_desc_ring_alloc Tero Kristo <t-kristo(a)ti.com> crypto: omap-sham - fix digcnt register handling with export/import Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: omap3isp: Fix memleak in isp_probe Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> media: uvcvideo: Set media controller entity functions Tom Rix <trix(a)redhat.com> media: m5mols: Check function pointer in m5mols_sensor_power Sylwester Nawrocki <s.nawrocki(a)samsung.com> media: Revert "media: exynos4-is: Add missed check for pinctrl_lookup_state()" Tom Rix <trix(a)redhat.com> media: tuner-simple: fix regression in simple_set_radio_freq Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> crypto: ixp4xx - Fix the size used in a 'dma_free_coherent()' call Tianjia Zhang <tianjia.zhang(a)linux.alibaba.com> crypto: mediatek - Fix wrong return value in mtk_desc_ring_alloc() Herbert Xu <herbert(a)gondor.apana.org.au> crypto: algif_skcipher - EBUSY on aio should be an error Mark Salter <msalter(a)redhat.com> drivers/perf: xgene_pmu: Fix uninitialized resource struct Arvind Sankar <nivedita(a)alum.mit.edu> x86/fpu: Allow multiple bits in clearcpuid= parameter Dinghao Liu <dinghao.liu(a)zju.edu.cn> EDAC/i5100: Fix error handling order in i5100_init_one() Herbert Xu <herbert(a)gondor.apana.org.au> crypto: algif_aead - Do not set MAY_BACKLOG on the async path Roberto Sassu <roberto.sassu(a)huawei.com> ima: Don't ignore errors from crypto_shash_update() Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> KVM: SVM: Initialize prev_ga_tag before use Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86/mmu: Commit zap of remaining invalid pages when recovering lpages Shyam Prasad N <sprasad(a)microsoft.com> cifs: Return the error from crypt_message when enc/dec key not found. Dan Carpenter <dan.carpenter(a)oracle.com> cifs: remove bogus debug code Eric Dumazet <edumazet(a)google.com> icmp: randomize the global rate limiter Neal Cardwell <ncardwell(a)google.com> tcp: fix to update snd_wl1 in bulk receiver fast path Defang Bo <bodefang(a)126.com> nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download() Xie He <xie.he.0141(a)gmail.com> net: hdlc_raw_eth: Clear the IFF_TX_SKB_SHARING flag after calling ether_setup Xie He <xie.he.0141(a)gmail.com> net: hdlc: In hdlc_rcv, check to make sure dev is an HDLC device Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: bebob: potential info leak in hwdep_read() Todd Kjos <tkjos(a)google.com> binder: fix UAF when releasing todo list Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix data corruption issue on RTL8402 Maciej Żenczykowski <maze(a)google.com> net/ipv4: always honour route mtu during forwarding Cong Wang <xiyou.wangcong(a)gmail.com> tipc: fix the skb_unshare() in tipc_buf_append() Wilken Gottwalt <wilken.gottwalt(a)mailbox.org> net: usb: qmi_wwan: add Cellient MPL200 card Jonathan Lemon <bsd(a)fb.com> mlx4: handle non-napi callers to napi_poll David Ahern <dsahern(a)kernel.org> ipv4: Restore flowi4_oif update before call to xfrm_lookup_route David Wilder <dwilder(a)us.ibm.com> ibmveth: Identify ingress large send packets. David Wilder <dwilder(a)us.ibm.com> ibmveth: Switch order of ibmveth_helper calls. ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 2 +- Documentation/networking/ip-sysctl.txt | 4 +- Makefile | 4 +- arch/arc/plat-hsdk/Kconfig | 1 + arch/arm/boot/dts/owl-s500.dtsi | 6 +- arch/arm/mm/cache-l2x0.c | 16 ++- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +- arch/powerpc/include/asm/reg.h | 2 +- arch/powerpc/kernel/tau_6xx.c | 82 ++++++---------- arch/powerpc/perf/hv-gpci-requests.h | 6 +- arch/powerpc/perf/isa207-common.c | 10 ++ arch/powerpc/platforms/Kconfig | 9 +- arch/powerpc/platforms/powernv/opal-dump.c | 41 +++++--- arch/powerpc/platforms/pseries/rng.c | 1 + arch/powerpc/sysdev/xics/icp-hv.c | 1 + arch/x86/kernel/fpu/init.c | 30 ++++-- arch/x86/kvm/emulate.c | 2 +- arch/x86/kvm/mmu.c | 1 + arch/x86/kvm/svm.c | 1 + crypto/algif_aead.c | 7 +- crypto/algif_skcipher.c | 2 +- drivers/android/binder.c | 35 ++----- drivers/bluetooth/hci_ldisc.c | 1 + drivers/bluetooth/hci_serdev.c | 2 + drivers/clk/at91/clk-main.c | 11 ++- drivers/clk/bcm/clk-bcm2835.c | 4 +- drivers/cpufreq/powernv-cpufreq.c | 9 +- drivers/crypto/ccp/ccp-ops.c | 2 +- drivers/crypto/ixp4xx_crypto.c | 2 +- drivers/crypto/mediatek/mtk-platform.c | 8 +- drivers/crypto/omap-sham.c | 3 + drivers/edac/i5100_edac.c | 11 +-- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 2 + drivers/gpu/drm/virtio/virtgpu_vq.c | 10 +- drivers/hid/hid-input.c | 4 +- drivers/hid/hid-roccat-kone.c | 23 +++-- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/i2c-core-acpi.c | 11 ++- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 1 - drivers/infiniband/hw/mlx4/cm.c | 3 + drivers/infiniband/hw/mlx4/mad.c | 34 ++++++- drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 + drivers/infiniband/hw/qedr/main.c | 2 +- drivers/infiniband/sw/rdmavt/vt.c | 4 +- drivers/input/keyboard/ep93xx_keypad.c | 4 +- drivers/input/keyboard/omap4-keypad.c | 6 +- drivers/input/keyboard/twl4030_keypad.c | 8 +- drivers/input/serio/sun4i-ps2.c | 9 +- drivers/input/touchscreen/imx6ul_tsc.c | 27 +++--- drivers/input/touchscreen/stmfts.c | 2 +- drivers/mailbox/mailbox.c | 12 ++- drivers/media/firewire/firedtv-fw.c | 6 +- drivers/media/i2c/m5mols/m5mols_core.c | 3 +- drivers/media/i2c/tc358743.c | 2 +- drivers/media/pci/bt8xx/bttv-driver.c | 13 ++- drivers/media/pci/saa7134/saa7134-tvaudio.c | 3 +- drivers/media/platform/exynos4-is/fimc-isp.c | 4 +- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- drivers/media/platform/exynos4-is/media-dev.c | 8 +- drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- drivers/media/platform/mx2_emmaprp.c | 7 +- drivers/media/platform/omap3isp/isp.c | 6 +- drivers/media/platform/qcom/venus/core.c | 5 +- drivers/media/platform/rcar-fcp.c | 4 +- drivers/media/platform/s3c-camif/camif-core.c | 5 +- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- drivers/media/platform/sti/delta/delta-v4l2.c | 4 +- drivers/media/platform/sti/hva/hva-hw.c | 4 +- drivers/media/platform/ti-vpe/vpe.c | 2 + drivers/media/platform/vsp1/vsp1_drv.c | 11 ++- drivers/media/rc/ati_remote.c | 4 + drivers/media/tuners/tuner-simple.c | 5 +- drivers/media/usb/uvc/uvc_entity.c | 35 +++++++ drivers/media/usb/uvc/uvc_v4l2.c | 30 ++++++ drivers/memory/fsl-corenet-cf.c | 6 +- drivers/memory/omap-gpmc.c | 4 +- drivers/mfd/rtsx_pcr.c | 4 +- drivers/mfd/sm501.c | 8 +- drivers/misc/eeprom/at25.c | 2 +- drivers/misc/mic/scif/scif_rma.c | 4 +- drivers/misc/mic/vop/vop_main.c | 2 +- drivers/misc/mic/vop/vop_vringh.c | 24 +++-- drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 +- drivers/mmc/core/sdio_cis.c | 3 + drivers/mtd/lpddr/lpddr2_nvm.c | 35 ++++--- drivers/mtd/mtdoops.c | 11 ++- drivers/net/can/flexcan.c | 34 +++++-- drivers/net/ethernet/cisco/enic/enic.h | 1 + drivers/net/ethernet/cisco/enic/enic_api.c | 6 ++ drivers/net/ethernet/cisco/enic/enic_main.c | 27 ++++-- drivers/net/ethernet/ibm/ibmveth.c | 19 +++- drivers/net/ethernet/korina.c | 3 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 108 +++++++++++---------- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wan/hdlc.c | 10 +- drivers/net/wan/hdlc_raw_eth.c | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 8 ++ drivers/net/wireless/ath/ath10k/mac.c | 2 +- drivers/net/wireless/ath/ath6kl/main.c | 3 + drivers/net/wireless/ath/ath6kl/wmi.c | 5 + drivers/net/wireless/ath/ath9k/hif_usb.c | 19 ++++ drivers/net/wireless/ath/ath9k/htc_hst.c | 2 + drivers/net/wireless/ath/wcn36xx/main.c | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- drivers/net/wireless/marvell/mwifiex/scan.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + drivers/nvme/target/core.c | 3 +- drivers/pci/host/pcie-iproc-msi.c | 13 ++- drivers/perf/xgene_pmu.c | 32 +++--- drivers/pinctrl/pinctrl-mcp23s08.c | 24 ++--- drivers/pwm/pwm-lpss.c | 7 +- drivers/rapidio/devices/rio_mport_cdev.c | 18 ++-- drivers/regulator/core.c | 21 ++-- drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/csiostor/csio_hw.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 1 + drivers/scsi/mvumi.c | 1 + drivers/scsi/qedi/qedi_fw.c | 23 ++++- drivers/scsi/qedi/qedi_iscsi.c | 2 + drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/ufs/ufs-qcom.c | 5 - drivers/tty/hvc/hvcs.c | 14 +-- drivers/tty/ipwireless/network.c | 4 +- drivers/tty/ipwireless/tty.c | 2 +- drivers/tty/pty.c | 2 +- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/usb/class/cdc-acm.c | 23 +++++ drivers/usb/class/cdc-wdm.c | 72 ++++++++++---- drivers/usb/core/urb.c | 89 ++++++++++------- drivers/usb/dwc2/gadget.c | 40 ++++++-- drivers/usb/dwc2/params.c | 2 +- drivers/usb/gadget/function/f_ncm.c | 8 +- drivers/usb/gadget/function/f_printer.c | 16 ++- drivers/usb/gadget/function/u_ether.c | 2 +- drivers/usb/host/ohci-hcd.c | 16 +-- drivers/vfio/pci/vfio_pci_intrs.c | 4 +- drivers/vfio/vfio_iommu_type1.c | 3 +- drivers/video/backlight/sky81452-backlight.c | 1 + drivers/video/fbdev/sis/init.c | 11 +-- drivers/video/fbdev/vga16fb.c | 14 +-- drivers/virt/fsl_hypervisor.c | 17 ++-- fs/cifs/asn1.c | 16 +-- fs/cifs/smb2ops.c | 2 +- fs/dlm/config.c | 3 + fs/ext4/fsmap.c | 3 + fs/f2fs/sysfs.c | 1 + fs/ntfs/inode.c | 6 ++ fs/proc/base.c | 3 +- fs/quota/quota_v2.c | 1 + fs/ramfs/file-nommu.c | 2 +- fs/reiserfs/inode.c | 3 +- fs/reiserfs/super.c | 8 +- fs/udf/inode.c | 25 ++--- fs/udf/super.c | 6 ++ fs/xfs/xfs_fsmap.c | 3 + fs/xfs/xfs_rtalloc.c | 11 +++ include/linux/oom.h | 1 + include/linux/overflow.h | 1 + include/linux/sched/coredump.h | 1 + include/net/ip.h | 6 ++ include/scsi/scsi_common.h | 7 ++ include/trace/events/target.h | 12 +-- include/uapi/linux/perf_event.h | 2 +- kernel/debug/kdb/kdb_io.c | 8 +- kernel/fork.c | 21 ++++ kernel/power/hibernate.c | 11 --- lib/crc32.c | 2 +- mm/memcontrol.c | 5 +- mm/oom_kill.c | 2 + net/bluetooth/l2cap_sock.c | 7 +- net/ipv4/icmp.c | 7 +- net/ipv4/route.c | 4 +- net/ipv4/tcp_input.c | 2 + net/mac80211/cfg.c | 3 +- net/mac80211/sta_info.c | 4 + net/netfilter/ipvs/ip_vs_ctl.c | 7 +- net/nfc/netlink.c | 2 +- net/tipc/msg.c | 3 +- net/wireless/nl80211.c | 5 +- samples/mic/mpssd/mpssd.c | 4 +- security/integrity/ima/ima_crypto.c | 2 + sound/core/seq/oss/seq_oss.c | 7 +- sound/firewire/bebob/bebob_hwdep.c | 3 +- sound/soc/qcom/lpass-cpu.c | 16 --- sound/soc/qcom/lpass-platform.c | 3 +- tools/perf/util/intel-pt.c | 8 +- 199 files changed, 1205 insertions(+), 626 deletions(-)

4 years, 3 months

4
194
0 0

[PATCH] drm/shme-helpers: Fix dma_buf_mmap forwarding bug

by Daniel Vetter

When we forward an mmap to the dma_buf exporter, they get to own everything. Unfortunately drm_gem_mmap_obj() overwrote vma->vm_private_data after the driver callback, wreaking the exporter complete. This was noticed because vb2_common_vm_close blew up on mali gpu with panfrost after commit 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf"). Unfortunately drm_gem_mmap_obj also acquires a surplus reference that we need to drop in shmem helpers, which is a bit of a mislayer situation. Maybe the entire dma_buf_mmap forwarding should be pulled into core gem code. Note that the only two other drivers which forward mmap in their own code (etnaviv and exynos) get this somewhat right by overwriting the gem mmap code. But they seem to still have the leak. This might be a good excuse to move these drivers over to shmem helpers completely. Note to stable team: There's a trivial context conflict with d693def4fd1c ("drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver"). I'm assuming it's clear where to put the first hunk, otherwise I can send a 5.9 version of this. Cc: Christian König <christian.koenig(a)amd.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Lucas Stach <l.stach(a)pengutronix.de> Cc: Russell King <linux+etnaviv(a)armlinux.org.uk> Cc: Christian Gmeiner <christian.gmeiner(a)gmail.com> Cc: Inki Dae <inki.dae(a)samsung.com> Cc: Joonyoung Shim <jy0922.shim(a)samsung.com> Cc: Seung-Woo Kim <sw0312.kim(a)samsung.com> Cc: Kyungmin Park <kyungmin.park(a)samsung.com> Fixes: 26d3ac3cb04d ("drm/shmem-helpers: Redirect mmap for imported dma-buf") Cc: Boris Brezillon <boris.brezillon(a)collabora.com> Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Rob Herring <robh(a)kernel.org> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-media(a)vger.kernel.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: <stable(a)vger.kernel.org> # v5.9+ Reported-and-tested-by: piotr.oniszczuk(a)gmail.com Cc: piotr.oniszczuk(a)gmail.com Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/drm_gem.c | 4 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 1da67d34e55d..d586068f5509 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1076,6 +1076,8 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, */ drm_gem_object_get(obj); + vma->vm_private_data = obj; + if (obj->funcs->mmap) { ret = obj->funcs->mmap(obj, vma); if (ret) { @@ -1096,8 +1098,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot); } - vma->vm_private_data = obj; - return 0; } EXPORT_SYMBOL(drm_gem_mmap_obj); diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index fb11df7aced5..8233bda4692f 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -598,8 +598,13 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) /* Remove the fake offset */ vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node); - if (obj->import_attach) + if (obj->import_attach) { + /* Drop the reference drm_gem_mmap_obj() acquired.*/ + drm_gem_object_put(obj); + vma->vm_private_data = NULL; + return dma_buf_mmap(obj->dma_buf, vma, 0); + } shmem = to_drm_gem_shmem_obj(obj); -- 2.28.0

4 years, 3 months

4
3
0 0

[PATCH v3] KVM: arm64: ARM_SMCCC_ARCH_WORKAROUND_1 doesn't return SMCCC_RET_NOT_REQUIRED

by Stephen Boyd

According to the SMCCC spec[1](7.5.2 Discovery) the ARM_SMCCC_ARCH_WORKAROUND_1 function id only returns 0, 1, and SMCCC_RET_NOT_SUPPORTED. 0 is "workaround required and safe to call this function" 1 is "workaround not required but safe to call this function" SMCCC_RET_NOT_SUPPORTED is "might be vulnerable or might not be, who knows, I give up!" SMCCC_RET_NOT_SUPPORTED might as well mean "workaround required, except calling this function may not work because it isn't implemented in some cases". Wonderful. We map this SMC call to 0 is SPECTRE_MITIGATED 1 is SPECTRE_UNAFFECTED SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE For KVM hypercalls (hvc), we've implemented this function id to return SMCCC_RET_NOT_SUPPORTED, 0, and SMCCC_RET_NOT_REQUIRED. One of those isn't supposed to be there. Per the code we call arm64_get_spectre_v2_state() to figure out what to return for this feature discovery call. 0 is SPECTRE_MITIGATED SMCCC_RET_NOT_REQUIRED is SPECTRE_UNAFFECTED SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE Let's clean this up so that KVM tells the guest this mapping: 0 is SPECTRE_MITIGATED 1 is SPECTRE_UNAFFECTED SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE Note: SMCCC_RET_NOT_AFFECTED is 1 but isn't part of the SMCCC spec Cc: Andre Przywara <andre.przywara(a)arm.com> Cc: Steven Price <steven.price(a)arm.com> Cc: Marc Zyngier <maz(a)kernel.org> Cc: stable(a)vger.kernel.org Link: https://developer.arm.com/documentation/den0028/latest [1] Fixes: c118bbb52743 ("arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests") Signed-off-by: Stephen Boyd <swboyd(a)chromium.org> --- I see that before commit c118bbb52743 ("arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests") we had this mapping: 0 is SPECTRE_MITIGATED SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE so the return value '1' wasn't there then. Once the commit was merged we introduced the notion of NOT_REQUIRED here when it shouldn't have been introduced. Changes from v2: * Moved define to header file and used it Changes from v1: * Way longer commit text, more background (sorry) * Dropped proton-pack part because it was wrong * Rebased onto other patch accepted upstream arch/arm64/kernel/proton-pack.c | 2 -- arch/arm64/kvm/hypercalls.c | 2 +- include/linux/arm-smccc.h | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index 25f3c80b5ffe..c18eb7d41274 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -135,8 +135,6 @@ static enum mitigation_state spectre_v2_get_cpu_hw_mitigation_state(void) return SPECTRE_VULNERABLE; } -#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED (1) - static enum mitigation_state spectre_v2_get_cpu_fw_mitigation_state(void) { int ret; diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c index 9824025ccc5c..25ea4ecb6449 100644 --- a/arch/arm64/kvm/hypercalls.c +++ b/arch/arm64/kvm/hypercalls.c @@ -31,7 +31,7 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) val = SMCCC_RET_SUCCESS; break; case SPECTRE_UNAFFECTED: - val = SMCCC_RET_NOT_REQUIRED; + val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED; break; } break; diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 15c706fb0a37..0e50ba3e88d7 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -86,6 +86,8 @@ ARM_SMCCC_SMC_32, \ 0, 0x7fff) +#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1 + /* Paravirtualised time calls (defined by ARM DEN0057A) */ #define ARM_SMCCC_HV_PV_TIME_FEATURES \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ base-commit: 66dd3474702aa98d5844367e1577cdad78ef7c65 -- Sent by a computer, using git, on the internet

4 years, 3 months

3
4
0 0

Re: [PATCH] media: i2c: imx258: correct mode to GBGB/RGRG

by Krzysztof Kozlowski

On Wed, 28 Oct 2020 at 10:43, Yeh, Andy <andy.yeh(a)intel.com> wrote: > > But the sensor settings for the original submission is to output GRBG Bayer RAW. > > Regards, Andy No, not to my knowledge. There are no settings for color output because it is fixed to GBGB/RGRG. I was looking a lot into this driver (I have few other problems with it, already few other patches posted) and I could not find a setting for this in datasheet. If you know the setting for the other color - can you point me to it? Best regards, Krzysztof > >-----Original Message----- > >From: Krzysztof Kozlowski <krzk(a)kernel.org> > >Sent: Wednesday, October 28, 2020 5:20 PM > >To: Sakari Ailus <sakari.ailus(a)linux.intel.com>; Mauro Carvalho Chehab > ><mchehab(a)kernel.org>; Tomasz Figa <tfiga(a)chromium.org>; Jason Chen > ><jasonx.z.chen(a)intel.com>; Yeh, Andy <andy.yeh(a)intel.com>; Alan Chiang > ><alanx.chiang(a)intel.com>; linux-media(a)vger.kernel.org; linux- > >kernel(a)vger.kernel.org > >Cc: Krzysztof Kozlowski <krzk(a)kernel.org>; stable(a)vger.kernel.org > >Subject: [PATCH] media: i2c: imx258: correct mode to GBGB/RGRG > > > >The IMX258 sensor outputs pixels in GBGB/RGRG mode. This is described > >explicitly in datasheet and was actually mentioned in a comment inside the > >driver. Using other - wrong mode - leads to pinkish pictures. > > > >Fixes: e4802cb00bfe ("media: imx258: Add imx258 camera sensor driver") > >Cc: <stable(a)vger.kernel.org> > >Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> > >--- > > drivers/media/i2c/imx258.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > >diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index > >ef069333a969..bf75d4e597af 100644 > >--- a/drivers/media/i2c/imx258.c > >+++ b/drivers/media/i2c/imx258.c > >@@ -715,7 +715,7 @@ static int imx258_open(struct v4l2_subdev *sd, struct > >v4l2_subdev_fh *fh) > > /* Initialize try_fmt */ > > try_fmt->width = supported_modes[0].width; > > try_fmt->height = supported_modes[0].height; > >- try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; > >+ try_fmt->code = MEDIA_BUS_FMT_SGBRG10_1X10; > > try_fmt->field = V4L2_FIELD_NONE; > > > > return 0; > >@@ -827,7 +827,7 @@ static int imx258_enum_mbus_code(struct > >v4l2_subdev *sd, > > if (code->index > 0) > > return -EINVAL; > > > >- code->code = MEDIA_BUS_FMT_SGRBG10_1X10; > >+ code->code = MEDIA_BUS_FMT_SGBRG10_1X10; > > > > return 0; > > } > >@@ -839,7 +839,7 @@ static int imx258_enum_frame_size(struct > >v4l2_subdev *sd, > > if (fse->index >= ARRAY_SIZE(supported_modes)) > > return -EINVAL; > > > >- if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10) > >+ if (fse->code != MEDIA_BUS_FMT_SGBRG10_1X10) > > return -EINVAL; > > > > fse->min_width = supported_modes[fse->index].width; > >@@ -855,7 +855,7 @@ static void imx258_update_pad_format(const struct > >imx258_mode *mode, { > > fmt->format.width = mode->width; > > fmt->format.height = mode->height; > >- fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; > >+ fmt->format.code = MEDIA_BUS_FMT_SGBRG10_1X10; > > fmt->format.field = V4L2_FIELD_NONE; > > } > > > >@@ -902,7 +902,7 @@ static int imx258_set_pad_format(struct v4l2_subdev > >*sd, > > mutex_lock(&imx258->mutex); > > > > /* Only one raw bayer(GBRG) order is supported */ > >- fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; > >+ fmt->format.code = MEDIA_BUS_FMT_SGBRG10_1X10; > > > > mode = v4l2_find_nearest_size(supported_modes, > > ARRAY_SIZE(supported_modes), width, height, > >-- > >2.25.1 >

4 years, 3 months

1
1
0 0

[PATCH] media: i2c: imx258: correct mode to GBGB/RGRG

by Krzysztof Kozlowski

The IMX258 sensor outputs pixels in GBGB/RGRG mode. This is described explicitly in datasheet and was actually mentioned in a comment inside the driver. Using other - wrong mode - leads to pinkish pictures. Fixes: e4802cb00bfe ("media: imx258: Add imx258 camera sensor driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> --- drivers/media/i2c/imx258.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index ef069333a969..bf75d4e597af 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -715,7 +715,7 @@ static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) /* Initialize try_fmt */ try_fmt->width = supported_modes[0].width; try_fmt->height = supported_modes[0].height; - try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; + try_fmt->code = MEDIA_BUS_FMT_SGBRG10_1X10; try_fmt->field = V4L2_FIELD_NONE; return 0; @@ -827,7 +827,7 @@ static int imx258_enum_mbus_code(struct v4l2_subdev *sd, if (code->index > 0) return -EINVAL; - code->code = MEDIA_BUS_FMT_SGRBG10_1X10; + code->code = MEDIA_BUS_FMT_SGBRG10_1X10; return 0; } @@ -839,7 +839,7 @@ static int imx258_enum_frame_size(struct v4l2_subdev *sd, if (fse->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10) + if (fse->code != MEDIA_BUS_FMT_SGBRG10_1X10) return -EINVAL; fse->min_width = supported_modes[fse->index].width; @@ -855,7 +855,7 @@ static void imx258_update_pad_format(const struct imx258_mode *mode, { fmt->format.width = mode->width; fmt->format.height = mode->height; - fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; + fmt->format.code = MEDIA_BUS_FMT_SGBRG10_1X10; fmt->format.field = V4L2_FIELD_NONE; } @@ -902,7 +902,7 @@ static int imx258_set_pad_format(struct v4l2_subdev *sd, mutex_lock(&imx258->mutex); /* Only one raw bayer(GBRG) order is supported */ - fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; + fmt->format.code = MEDIA_BUS_FMT_SGBRG10_1X10; mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes), width, height, -- 2.25.1

4 years, 3 months

1
0
0 0

[PATCH] block: advance iov_iter on bio_add_hw_page failure

by Naohiro Aota

When the bio's size reaches max_append_sectors, bio_add_hw_page returns 0 then __bio_iov_append_get_pages returns -EINVAL. This is an expected result of building a small enough bio not to be split in the IO path. However, iov_iter is not advanced in this case, causing the same pages are filled for the bio again and again. Fix the case by properly advancing the iov_iter for already processed pages. Fixes: 0512a75b98f8 ("block: Introduce REQ_OP_ZONE_APPEND") Cc: stable(a)vger.kernel.org # 5.8+ Signed-off-by: Naohiro Aota <naohiro.aota(a)wdc.com> --- block/bio.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/block/bio.c b/block/bio.c index e0d41ccc4e90..2dfe40be4d6b 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1082,6 +1082,7 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter) ssize_t size, left; unsigned len, i; size_t offset; + int ret = 0; if (WARN_ON_ONCE(!max_append_sectors)) return 0; @@ -1104,15 +1105,17 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter) len = min_t(size_t, PAGE_SIZE - offset, left); if (bio_add_hw_page(q, bio, page, len, offset, - max_append_sectors, &same_page) != len) - return -EINVAL; + max_append_sectors, &same_page) != len) { + ret = -EINVAL; + break; + } if (same_page) put_page(page); offset = 0; } - iov_iter_advance(iter, size); - return 0; + iov_iter_advance(iter, size - left); + return ret; } /** -- 2.27.0

4 years, 3 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2020