From: Sasha Levin Date: Wed, 16 Jun 2021 11:58:22 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v5.4.127~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3eeb830054e12d94df1fe65afdb02649ea57bb4b;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch b/queue-4.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch new file mode 100644 index 00000000000..1254ba1079a --- /dev/null +++ b/queue-4.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch @@ -0,0 +1,49 @@ +From 80344a8148ed41850ff9b4a6d991fa2b6601ba08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Apr 2021 13:15:33 +0000 +Subject: ARM: OMAP2+: Fix build warning when mmc_omap is not built + +From: Yongqiang Liu + +[ Upstream commit 040ab72ee10ea88e1883ad143b3e2b77596abc31 ] + +GCC reports the following warning with W=1: + +arch/arm/mach-omap2/board-n8x0.c:325:19: warning: +variable 'index' set but not used [-Wunused-but-set-variable] +325 | int bit, *openp, index; + | ^~~~~ + +Fix this by moving CONFIG_MMC_OMAP to cover the rest codes +in the n8x0_mmc_callback(). + +Signed-off-by: Yongqiang Liu +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c +index b6443a4e0c78..68af9d9566cb 100644 +--- a/arch/arm/mach-omap2/board-n8x0.c ++++ b/arch/arm/mach-omap2/board-n8x0.c +@@ -328,6 +328,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot) + + static void n8x0_mmc_callback(void *data, u8 card_mask) + { ++#ifdef CONFIG_MMC_OMAP + int bit, *openp, index; + + if (board_is_n800()) { +@@ -345,7 +346,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) + else + *openp = 0; + +-#ifdef CONFIG_MMC_OMAP + omap_mmc_notify_cover_event(mmc_device, index, *openp); + #else + pr_warn("MMC: notify cover event not available\n"); +-- +2.30.2 + diff --git a/queue-4.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch b/queue-4.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch new file mode 100644 index 00000000000..b725afe8a54 --- /dev/null +++ b/queue-4.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch @@ -0,0 +1,40 @@ +From c4213348c70effa5afcd919f9bbc1c827b53b2e2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 19:04:51 +0800 +Subject: ethernet: myri10ge: Fix missing error code in myri10ge_probe() + +From: Jiapeng Chong + +[ Upstream commit f336d0b93ae978f12c5e27199f828da89b91e56a ] + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'status'. + +Eliminate the follow smatch warning: + +drivers/net/ethernet/myricom/myri10ge/myri10ge.c:3818 myri10ge_probe() +warn: missing error code 'status'. + +Reported-by: Abaci Robot +Signed-off-by: Jiapeng Chong +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +index 8ebf3611aba3..9ecb99a1de35 100644 +--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c ++++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +@@ -4051,6 +4051,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + dev_err(&pdev->dev, + "invalid sram_size %dB or board span %ldB\n", + mgp->sram_size, mgp->board_span); ++ status = -EINVAL; + goto abort_with_ioremap; + } + memcpy_fromio(mgp->eeprom_strings, +-- +2.30.2 + diff --git a/queue-4.4/fib-return-the-correct-errno-code.patch b/queue-4.4/fib-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..8fd4f2f0ade --- /dev/null +++ b/queue-4.4/fib-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 142b0d9127ae1cc58e0159fefbde3f2bde46cd85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:58 +0800 +Subject: fib: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit 59607863c54e9eb3f69afc5257dfe71c38bb751e ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/fib_rules.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c +index 2fd4aae8f285..b9cbab73d0de 100644 +--- a/net/core/fib_rules.c ++++ b/net/core/fib_rules.c +@@ -695,7 +695,7 @@ static void notify_rule_change(int event, struct fib_rule *rule, + { + struct net *net; + struct sk_buff *skb; +- int err = -ENOBUFS; ++ int err = -ENOMEM; + + net = ops->fro_net; + skb = nlmsg_new(fib_rule_nlmsg_size(ops, rule), GFP_KERNEL); +-- +2.30.2 + diff --git a/queue-4.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch b/queue-4.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch new file mode 100644 index 00000000000..f1d69ec2936 --- /dev/null +++ b/queue-4.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch @@ -0,0 +1,51 @@ +From 19fbad5b3a742f6dba9a36c57a896755e6564d1f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 May 2021 16:46:25 +0800 +Subject: gfs2: Fix use-after-free in gfs2_glock_shrink_scan + +From: Hillf Danton + +[ Upstream commit 1ab19c5de4c537ec0d9b21020395a5b5a6c059b2 ] + +The GLF_LRU flag is checked under lru_lock in gfs2_glock_remove_from_lru() to +remove the glock from the lru list in __gfs2_glock_put(). + +On the shrink scan path, the same flag is cleared under lru_lock but because +of cond_resched_lock(&lru_lock) in gfs2_dispose_glock_lru(), progress on the +put side can be made without deleting the glock from the lru list. + +Keep GLF_LRU across the race window opened by cond_resched_lock(&lru_lock) to +ensure correct behavior on both sides - clear GLF_LRU after list_del under +lru_lock. + +Reported-by: syzbot +Signed-off-by: Hillf Danton +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/glock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c +index 8e8695eb652a..f115ce93dfb4 100644 +--- a/fs/gfs2/glock.c ++++ b/fs/gfs2/glock.c +@@ -1342,6 +1342,7 @@ __acquires(&lru_lock) + while(!list_empty(list)) { + gl = list_entry(list->next, struct gfs2_glock, gl_lru); + list_del_init(&gl->gl_lru); ++ clear_bit(GLF_LRU, &gl->gl_flags); + if (!spin_trylock(&gl->gl_lockref.lock)) { + add_back_to_lru: + list_add(&gl->gl_lru, &lru_list); +@@ -1388,7 +1389,6 @@ static long gfs2_scan_glock_lru(int nr) + if (!test_bit(GLF_LOCK, &gl->gl_flags)) { + list_move(&gl->gl_lru, &dispose); + atomic_dec(&lru_count); +- clear_bit(GLF_LRU, &gl->gl_flags); + freed++; + continue; + } +-- +2.30.2 + diff --git a/queue-4.4/hid-add-bus_virtual-to-hid_connect-logging.patch b/queue-4.4/hid-add-bus_virtual-to-hid_connect-logging.patch new file mode 100644 index 00000000000..cf560db0fc9 --- /dev/null +++ b/queue-4.4/hid-add-bus_virtual-to-hid_connect-logging.patch @@ -0,0 +1,36 @@ +From d77db88f7b54e5e4fb88faf91854fc4a51ce5d24 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 May 2021 17:39:38 +0100 +Subject: HID: Add BUS_VIRTUAL to hid_connect logging + +From: Mark Bolhuis + +[ Upstream commit 48e33befe61a7d407753c53d1a06fc8d6b5dab80 ] + +Add BUS_VIRTUAL to hid_connect logging since it's a valid hid bus type and it +should not print + +Signed-off-by: Mark Bolhuis +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index 25544a08fa83..1dd97f4b449a 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -1765,6 +1765,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) + case BUS_I2C: + bus = "I2C"; + break; ++ case BUS_VIRTUAL: ++ bus = "VIRTUAL"; ++ break; + default: + bus = ""; + } +-- +2.30.2 + diff --git a/queue-4.4/hid-gt683r-add-missing-module_device_table.patch b/queue-4.4/hid-gt683r-add-missing-module_device_table.patch new file mode 100644 index 00000000000..61062c763e6 --- /dev/null +++ b/queue-4.4/hid-gt683r-add-missing-module_device_table.patch @@ -0,0 +1,36 @@ +From cfc15c2cf42ad49aa29b711ea6b5cf5ba281e8cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 11:14:48 +0800 +Subject: HID: gt683r: add missing MODULE_DEVICE_TABLE + +From: Bixuan Cui + +[ Upstream commit a4b494099ad657f1cb85436d333cf38870ee95bc ] + +This patch adds missing MODULE_DEVICE_TABLE definition which generates +correct modalias for automatic loading of this driver when it is built +as an external module. + +Reported-by: Hulk Robot +Signed-off-by: Bixuan Cui +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-gt683r.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/hid/hid-gt683r.c b/drivers/hid/hid-gt683r.c +index 0d6f135e266c..2991957bbb7f 100644 +--- a/drivers/hid/hid-gt683r.c ++++ b/drivers/hid/hid-gt683r.c +@@ -64,6 +64,7 @@ static const struct hid_device_id gt683r_led_id[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, + { } + }; ++MODULE_DEVICE_TABLE(hid, gt683r_led_id); + + static void gt683r_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +-- +2.30.2 + diff --git a/queue-4.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch b/queue-4.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch new file mode 100644 index 00000000000..55272c471b0 --- /dev/null +++ b/queue-4.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch @@ -0,0 +1,53 @@ +From 1151192a72f9f9b22e881467fc64ff5b30c86f9f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 15 Apr 2021 11:52:31 -0700 +Subject: HID: hid-sensor-hub: Return error for hid_set_field() failure + +From: Srinivas Pandruvada + +[ Upstream commit edb032033da0dc850f6e7740fa1023c73195bc89 ] + +In the function sensor_hub_set_feature(), return error when hid_set_field() +fails. + +Signed-off-by: Srinivas Pandruvada +Acked-by: Jonathan Cameron +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-sensor-hub.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c +index 83e45d5801a9..ce4e9b34af98 100644 +--- a/drivers/hid/hid-sensor-hub.c ++++ b/drivers/hid/hid-sensor-hub.c +@@ -222,16 +222,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, + buffer_size = buffer_size / sizeof(__s32); + if (buffer_size) { + for (i = 0; i < buffer_size; ++i) { +- hid_set_field(report->field[field_index], i, +- (__force __s32)cpu_to_le32(*buf32)); ++ ret = hid_set_field(report->field[field_index], i, ++ (__force __s32)cpu_to_le32(*buf32)); ++ if (ret) ++ goto done_proc; ++ + ++buf32; + } + } + if (remaining_bytes) { + value = 0; + memcpy(&value, (u8 *)buf32, remaining_bytes); +- hid_set_field(report->field[field_index], i, +- (__force __s32)cpu_to_le32(value)); ++ ret = hid_set_field(report->field[field_index], i, ++ (__force __s32)cpu_to_le32(value)); ++ if (ret) ++ goto done_proc; + } + hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT); + hid_hw_wait(hsdev->hdev); +-- +2.30.2 + diff --git a/queue-4.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch b/queue-4.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch new file mode 100644 index 00000000000..80b745485cb --- /dev/null +++ b/queue-4.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch @@ -0,0 +1,59 @@ +From ad790897b5e1a1a84c660c1f2c96a9438676ad92 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Apr 2021 23:03:53 +0530 +Subject: HID: usbhid: fix info leak in hid_submit_ctrl + +From: Anirudh Rayabharam + +[ Upstream commit 6be388f4a35d2ce5ef7dbf635a8964a5da7f799f ] + +In hid_submit_ctrl(), the way of calculating the report length doesn't +take into account that report->size can be zero. When running the +syzkaller reproducer, a report of size 0 causes hid_submit_ctrl) to +calculate transfer_buffer_length as 16384. When this urb is passed to +the usb core layer, KMSAN reports an info leak of 16384 bytes. + +To fix this, first modify hid_report_len() to account for the zero +report size case by using DIV_ROUND_UP for the division. Then, call it +from hid_submit_ctrl(). + +Reported-by: syzbot+7c2bb71996f95a82524c@syzkaller.appspotmail.com +Signed-off-by: Anirudh Rayabharam +Acked-by: Benjamin Tissoires +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/usbhid/hid-core.c | 2 +- + include/linux/hid.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c +index b0eeb5090c91..d51fc2be0e10 100644 +--- a/drivers/hid/usbhid/hid-core.c ++++ b/drivers/hid/usbhid/hid-core.c +@@ -372,7 +372,7 @@ static int hid_submit_ctrl(struct hid_device *hid) + raw_report = usbhid->ctrl[usbhid->ctrltail].raw_report; + dir = usbhid->ctrl[usbhid->ctrltail].dir; + +- len = ((report->size - 1) >> 3) + 1 + (report->id > 0); ++ len = hid_report_len(report); + if (dir == USB_DIR_OUT) { + usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0); + usbhid->urbctrl->transfer_buffer_length = len; +diff --git a/include/linux/hid.h b/include/linux/hid.h +index 19c53b64e07a..6adea5a39724 100644 +--- a/include/linux/hid.h ++++ b/include/linux/hid.h +@@ -1119,8 +1119,7 @@ static inline void hid_hw_wait(struct hid_device *hdev) + */ + static inline u32 hid_report_len(struct hid_report *report) + { +- /* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */ +- return ((report->size - 1) >> 3) + 1 + (report->id > 0); ++ return DIV_ROUND_UP(report->size, 8) + (report->id > 0); + } + + int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, +-- +2.30.2 + diff --git a/queue-4.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch b/queue-4.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch new file mode 100644 index 00000000000..f9645089362 --- /dev/null +++ b/queue-4.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch @@ -0,0 +1,62 @@ +From c3d6fab378c20880160f3821a711c985a1129e55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 18:38:41 -0700 +Subject: net: ipconfig: Don't override command-line hostnames or domains + +From: Josh Triplett + +[ Upstream commit b508d5fb69c2211a1b860fc058aafbefc3b3c3cd ] + +If the user specifies a hostname or domain name as part of the ip= +command-line option, preserve it and don't overwrite it with one +supplied by DHCP/BOOTP. + +For instance, ip=::::myhostname::dhcp will use "myhostname" rather than +ignoring and overwriting it. + +Fix the comment on ic_bootp_string that suggests it only copies a string +"if not already set"; it doesn't have any such logic. + +Signed-off-by: Josh Triplett +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/ipconfig.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c +index 60f564db25a3..173777aa5add 100644 +--- a/net/ipv4/ipconfig.c ++++ b/net/ipv4/ipconfig.c +@@ -890,7 +890,7 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d + + + /* +- * Copy BOOTP-supplied string if not already set. ++ * Copy BOOTP-supplied string + */ + static int __init ic_bootp_string(char *dest, char *src, int len, int max) + { +@@ -941,12 +941,15 @@ static void __init ic_do_bootp_ext(u8 *ext) + } + break; + case 12: /* Host name */ +- ic_bootp_string(utsname()->nodename, ext+1, *ext, +- __NEW_UTS_LEN); +- ic_host_name_set = 1; ++ if (!ic_host_name_set) { ++ ic_bootp_string(utsname()->nodename, ext+1, *ext, ++ __NEW_UTS_LEN); ++ ic_host_name_set = 1; ++ } + break; + case 15: /* Domain name (DNS) */ +- ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); ++ if (!ic_domain[0]) ++ ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); + break; + case 17: /* Root path */ + if (!root_server_path[0]) +-- +2.30.2 + diff --git a/queue-4.4/net-return-the-correct-errno-code.patch b/queue-4.4/net-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..969d658432a --- /dev/null +++ b/queue-4.4/net-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From e6e0917ff11d743ce11bbe1a1194e1e9d2feb36b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:40 +0800 +Subject: net: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit 49251cd00228a3c983651f6bb2f33f6a0b8f152e ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/compat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/compat.c b/net/compat.c +index 20c5e5f215f2..14459a87fdbc 100644 +--- a/net/compat.c ++++ b/net/compat.c +@@ -159,7 +159,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, + if (kcmlen > stackbuf_size) + kcmsg_base = kcmsg = sock_kmalloc(sk, kcmlen, GFP_KERNEL); + if (kcmsg == NULL) +- return -ENOBUFS; ++ return -ENOMEM; + + /* Now copy them over neatly. */ + memset(kcmsg, 0, kcmlen); +-- +2.30.2 + diff --git a/queue-4.4/net-x25-return-the-correct-errno-code.patch b/queue-4.4/net-x25-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..64124d6702f --- /dev/null +++ b/queue-4.4/net-x25-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 86cea5638e31c514973cd355a9d4a26cc8b4e14a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 22:06:30 +0800 +Subject: net/x25: Return the correct errno code + +From: Zheng Yongjun + +[ Upstream commit d7736958668c4facc15f421e622ffd718f5be80a ] + +When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. + +Signed-off-by: Zheng Yongjun +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/x25/af_x25.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c +index a9fd95d10e84..156639be7ed0 100644 +--- a/net/x25/af_x25.c ++++ b/net/x25/af_x25.c +@@ -550,7 +550,7 @@ static int x25_create(struct net *net, struct socket *sock, int protocol, + if (protocol) + goto out; + +- rc = -ENOBUFS; ++ rc = -ENOMEM; + if ((sk = x25_alloc_socket(net, kern)) == NULL) + goto out; + +-- +2.30.2 + diff --git a/queue-4.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch b/queue-4.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch new file mode 100644 index 00000000000..42c2d6ba3bf --- /dev/null +++ b/queue-4.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch @@ -0,0 +1,44 @@ +From d1f161e1c47a8fd46af578abde88fc8dcdf56189 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jun 2021 18:15:04 +0800 +Subject: rtnetlink: Fix missing error code in rtnl_bridge_notify() + +From: Jiapeng Chong + +[ Upstream commit a8db57c1d285c758adc7fb43d6e2bad2554106e1 ] + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'err'. + +Eliminate the follow smatch warning: + +net/core/rtnetlink.c:4834 rtnl_bridge_notify() warn: missing error code +'err'. + +Reported-by: Abaci Robot +Signed-off-by: Jiapeng Chong +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/rtnetlink.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c +index e2a0aed52983..11d2da8abd73 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -3240,8 +3240,10 @@ static int rtnl_bridge_notify(struct net_device *dev) + if (err < 0) + goto errout; + +- if (!skb->len) ++ if (!skb->len) { ++ err = -EINVAL; + goto errout; ++ } + + rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC); + return 0; +-- +2.30.2 + diff --git a/queue-4.4/scsi-target-core-fix-warning-on-realtime-kernels.patch b/queue-4.4/scsi-target-core-fix-warning-on-realtime-kernels.patch new file mode 100644 index 00000000000..e5b690fd12a --- /dev/null +++ b/queue-4.4/scsi-target-core-fix-warning-on-realtime-kernels.patch @@ -0,0 +1,43 @@ +From cf903f9fc4a6d754ff20c7dc57ab068b3f2c3e9a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 May 2021 14:13:26 +0200 +Subject: scsi: target: core: Fix warning on realtime kernels + +From: Maurizio Lombardi + +[ Upstream commit 515da6f4295c2c42b8c54572cce3d2dd1167c41e ] + +On realtime kernels, spin_lock_irq*(spinlock_t) do not disable the +interrupts, a call to irqs_disabled() will return false thus firing a +warning in __transport_wait_for_tasks(). + +Remove the warning and also replace assert_spin_locked() with +lockdep_assert_held() + +Link: https://lore.kernel.org/r/20210531121326.3649-1-mlombard@redhat.com +Reviewed-by: Bart Van Assche +Signed-off-by: Maurizio Lombardi +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_transport.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c +index 96cf2448a1f4..6c6aa23ced45 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -2757,9 +2757,7 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop, + __releases(&cmd->t_state_lock) + __acquires(&cmd->t_state_lock) + { +- +- assert_spin_locked(&cmd->t_state_lock); +- WARN_ON_ONCE(!irqs_disabled()); ++ lockdep_assert_held(&cmd->t_state_lock); + + if (fabric_stop) + cmd->transport_state |= CMD_T_FABRIC_STOP; +-- +2.30.2 + diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..7e1ce25df05 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1,13 @@ +hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch +hid-add-bus_virtual-to-hid_connect-logging.patch +hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch +arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch +hid-gt683r-add-missing-module_device_table.patch +gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch +scsi-target-core-fix-warning-on-realtime-kernels.patch +ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch +net-ipconfig-don-t-override-command-line-hostnames-o.patch +rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch +net-x25-return-the-correct-errno-code.patch +net-return-the-correct-errno-code.patch +fib-return-the-correct-errno-code.patch