From: Greg Kroah-Hartman Date: Tue, 20 Apr 2021 11:54:29 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.4.114~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c60fc055ddf527938e6ada5b239b0e101e37b9be;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch --- diff --git a/queue-4.14/pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch b/queue-4.14/pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch index 029b56d6bce..2aa2f1fbf61 100644 --- a/queue-4.14/pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch +++ b/queue-4.14/pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch @@ -23,14 +23,12 @@ Signed-off-by: Guenter Roeck Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/amd/pcnet32.c | 5 +++-- + drivers/net/ethernet/amd/pcnet32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c -index 7f60d17819ce..073184f15c64 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c -@@ -1548,8 +1548,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1548,8 +1548,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, } pci_set_master(pdev); @@ -40,7 +38,7 @@ index 7f60d17819ce..073184f15c64 100644 if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("card has no PCI IO resources, aborting\n"); return -ENODEV; -@@ -1561,6 +1560,8 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1561,6 +1560,8 @@ pcnet32_probe_pci(struct pci_dev *pdev, pr_err("architecture does not support 32bit PCI busmaster DMA\n"); return err; } @@ -49,6 +47,3 @@ index 7f60d17819ce..073184f15c64 100644 if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) { if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("io address range already allocated\n"); --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index 5359adec1e7..a55a166543a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -15,6 +15,7 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch +usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch input-i8042-fix-pegatron-c15b-id-entry.patch hid-wacom-set-ev_key-and-ev_abs-only-for-non-hid_generic-type-of-devices.patch diff --git a/queue-4.14/usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch b/queue-4.14/usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch new file mode 100644 index 00000000000..32ee73186cc --- /dev/null +++ b/queue-4.14/usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch @@ -0,0 +1,35 @@ +From 9858af27e69247c5d04c3b093190a93ca365f33d Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Thu, 11 Mar 2021 10:44:45 +0000 +Subject: usbip: Fix incorrect double assignment to udc->ud.tcp_rx + +From: Colin Ian King + +commit 9858af27e69247c5d04c3b093190a93ca365f33d upstream. + +Currently udc->ud.tcp_rx is being assigned twice, the second assignment +is incorrect, it should be to udc->ud.tcp_tx instead of rx. Fix this. + +Fixes: 46613c9dfa96 ("usbip: fix vudc usbip_sockfd_store races leading to gpf") +Acked-by: Shuah Khan +Signed-off-by: Colin Ian King +Cc: stable +Addresses-Coverity: ("Unused value") +Link: https://lore.kernel.org/r/20210311104445.7811-1-colin.king@canonical.com +Signed-off-by: Tom Seewald +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/usbip/vudc_sysfs.c ++++ b/drivers/usb/usbip/vudc_sysfs.c +@@ -187,7 +187,7 @@ static ssize_t store_sockfd(struct devic + + udc->ud.tcp_socket = socket; + udc->ud.tcp_rx = tcp_rx; +- udc->ud.tcp_rx = tcp_tx; ++ udc->ud.tcp_tx = tcp_tx; + udc->ud.status = SDEV_ST_USED; + + spin_unlock_irq(&udc->ud.lock);