From: Sasha Levin Date: Wed, 16 Jun 2021 11:58:19 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v5.4.127~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e88c4f5fba0eec3420251e7113df52c5d3c2f65b;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch b/queue-5.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch new file mode 100644 index 00000000000..5ad7837a8a0 --- /dev/null +++ b/queue-5.4/arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch @@ -0,0 +1,49 @@ +From 7971281425a53ebbe3ce6b0cf01d9f93b1ff1895 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 418a61ecb827..5e86145db0e2 100644 +--- a/arch/arm/mach-omap2/board-n8x0.c ++++ b/arch/arm/mach-omap2/board-n8x0.c +@@ -322,6 +322,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()) { +@@ -339,7 +340,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-5.4/drm-amd-display-allow-bandwidth-validation-for-0-str.patch b/queue-5.4/drm-amd-display-allow-bandwidth-validation-for-0-str.patch new file mode 100644 index 00000000000..6b038efbec5 --- /dev/null +++ b/queue-5.4/drm-amd-display-allow-bandwidth-validation-for-0-str.patch @@ -0,0 +1,43 @@ +From a5b7f8f4a729366445947135d6b525731e818274 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 May 2021 10:06:04 -0400 +Subject: drm/amd/display: Allow bandwidth validation for 0 streams. + +From: Bindu Ramamurthy + +[ Upstream commit ba8e59773ae59818695d1e20b8939282da80ec8c ] + +[Why] +Bandwidth calculations are triggered for non zero streams, and +in case of 0 streams, these calculations were skipped with +pstate status not being updated. + +[How] +As the pstate status is applicable for non zero streams, check +added for allowing 0 streams inline with dcn internal bandwidth +validations. + +Signed-off-by: Bindu Ramamurthy +Reviewed-by: Roman Li +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +index 08062de3fbeb..2b1175bb2dae 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +@@ -2917,7 +2917,7 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, + voltage_supported = dcn20_validate_bandwidth_internal(dc, context, false); + dummy_pstate_supported = context->bw_ctx.bw.dcn.clk.p_state_change_support; + +- if (voltage_supported && dummy_pstate_supported) { ++ if (voltage_supported && (dummy_pstate_supported || !(context->stream_count))) { + context->bw_ctx.bw.dcn.clk.p_state_change_support = false; + goto restore_dml_state; + } +-- +2.30.2 + diff --git a/queue-5.4/drm-amd-display-fix-overlay-validation-by-considerin.patch b/queue-5.4/drm-amd-display-fix-overlay-validation-by-considerin.patch new file mode 100644 index 00000000000..00747e6bbf0 --- /dev/null +++ b/queue-5.4/drm-amd-display-fix-overlay-validation-by-considerin.patch @@ -0,0 +1,73 @@ +From dbb1acb6f60755032c544a902f5dbc0b04b0aa81 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 May 2021 07:47:34 -0400 +Subject: drm/amd/display: Fix overlay validation by considering cursors + +From: Rodrigo Siqueira + +[ Upstream commit 33f409e60eb0c59a4d0d06a62ab4642a988e17f7 ] + +A few weeks ago, we saw a two cursor issue in a ChromeOS system. We +fixed it in the commit: + + drm/amd/display: Fix two cursor duplication when using overlay + (read the commit message for more details) + +After this change, we noticed that some IGT subtests related to +kms_plane and kms_plane_scaling started to fail. After investigating +this issue, we noticed that all subtests that fail have a primary plane +covering the overlay plane, which is currently rejected by amdgpu dm. +Fail those IGT tests highlight that our verification was too broad and +compromises the overlay usage in our drive. This patch fixes this issue +by ensuring that we only reject commits where the primary plane is not +fully covered by the overlay when the cursor hardware is enabled. With +this fix, all IGT tests start to pass again, which means our overlay +support works as expected. + +Cc: Tianci.Yin +Cc: Harry Wentland +Cc: Nicholas Choi +Cc: Bhawanpreet Lakha +Cc: Nicholas Kazlauskas +Cc: Mark Yacoub +Cc: Daniel Wheeler + +Tested-by: Daniel Wheeler +Signed-off-by: Rodrigo Siqueira +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 6e31e899192c..29657844bac1 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -7272,7 +7272,7 @@ static int validate_overlay(struct drm_atomic_state *state) + int i; + struct drm_plane *plane; + struct drm_plane_state *old_plane_state, *new_plane_state; +- struct drm_plane_state *primary_state, *overlay_state = NULL; ++ struct drm_plane_state *primary_state, *cursor_state, *overlay_state = NULL; + + /* Check if primary plane is contained inside overlay */ + for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { +@@ -7302,6 +7302,14 @@ static int validate_overlay(struct drm_atomic_state *state) + if (!primary_state->crtc) + return 0; + ++ /* check if cursor plane is enabled */ ++ cursor_state = drm_atomic_get_plane_state(state, overlay_state->crtc->cursor); ++ if (IS_ERR(cursor_state)) ++ return PTR_ERR(cursor_state); ++ ++ if (drm_atomic_plane_disabling(plane->state, cursor_state)) ++ return 0; ++ + /* Perform the bounds check to ensure the overlay plane covers the primary */ + if (primary_state->crtc_x < overlay_state->crtc_x || + primary_state->crtc_y < overlay_state->crtc_y || +-- +2.30.2 + diff --git a/queue-5.4/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch b/queue-5.4/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch new file mode 100644 index 00000000000..4e847f8037f --- /dev/null +++ b/queue-5.4/drm-tegra-sor-do-not-leak-runtime-pm-reference.patch @@ -0,0 +1,80 @@ +From 4922c4ae11170c6cf8a8d85acfad6ca095c90b53 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Apr 2021 13:54:14 +0200 +Subject: drm/tegra: sor: Do not leak runtime PM reference + +From: Pavel Machek (CIP) + +[ Upstream commit 73a395c46704304b96bc5e2ee19be31124025c0c ] + +It's theoretically possible for the runtime PM reference to leak if the +code fails anywhere between the pm_runtime_resume_and_get() and +pm_runtime_put() calls, so make sure to release the runtime PM reference +in that case. + +Practically this will never happen because none of the functions will +fail on Tegra, but it's better for the code to be pedantic in case these +assumptions will ever become wrong. + +Signed-off-by: Pavel Machek (CIP) +[treding@nvidia.com: add commit message] +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/tegra/sor.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c +index 6c3d22165239..0419b6105c8a 100644 +--- a/drivers/gpu/drm/tegra/sor.c ++++ b/drivers/gpu/drm/tegra/sor.c +@@ -2875,21 +2875,21 @@ static int tegra_sor_init(struct host1x_client *client) + if (err < 0) { + dev_err(sor->dev, "failed to acquire SOR reset: %d\n", + err); +- return err; ++ goto rpm_put; + } + + err = reset_control_assert(sor->rst); + if (err < 0) { + dev_err(sor->dev, "failed to assert SOR reset: %d\n", + err); +- return err; ++ goto rpm_put; + } + } + + err = clk_prepare_enable(sor->clk); + if (err < 0) { + dev_err(sor->dev, "failed to enable clock: %d\n", err); +- return err; ++ goto rpm_put; + } + + usleep_range(1000, 3000); +@@ -2900,7 +2900,7 @@ static int tegra_sor_init(struct host1x_client *client) + dev_err(sor->dev, "failed to deassert SOR reset: %d\n", + err); + clk_disable_unprepare(sor->clk); +- return err; ++ goto rpm_put; + } + + reset_control_release(sor->rst); +@@ -2929,6 +2929,12 @@ static int tegra_sor_init(struct host1x_client *client) + tegra_sor_writel(sor, value, SOR_INT_MASK); + + return 0; ++ ++rpm_put: ++ if (sor->rst) ++ pm_runtime_put(sor->dev); ++ ++ return err; + } + + static int tegra_sor_exit(struct host1x_client *client) +-- +2.30.2 + diff --git a/queue-5.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch b/queue-5.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch new file mode 100644 index 00000000000..8d6448c71b9 --- /dev/null +++ b/queue-5.4/ethernet-myri10ge-fix-missing-error-code-in-myri10ge.patch @@ -0,0 +1,40 @@ +From be8bffe922e9c6d5ca8345e5c4cdf51ce10e1dbc 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 c979f38a2e0c..c4c716094982 100644 +--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c ++++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +@@ -3849,6 +3849,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-5.4/fib-return-the-correct-errno-code.patch b/queue-5.4/fib-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..b8dcbe21693 --- /dev/null +++ b/queue-5.4/fib-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From 8db5534d94f39c427f5a88fcd1779eedd7e3cf61 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 bb11fc87bbae..675f27ef6872 100644 +--- a/net/core/fib_rules.c ++++ b/net/core/fib_rules.c +@@ -1138,7 +1138,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-5.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch b/queue-5.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch new file mode 100644 index 00000000000..4a8236276e5 --- /dev/null +++ b/queue-5.4/gfs2-fix-use-after-free-in-gfs2_glock_shrink_scan.patch @@ -0,0 +1,51 @@ +From 4ca2c336f9c0bb05f74abe776d89bd97d188b5dc 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 9e1685a30bf8..01c41087f067 100644 +--- a/fs/gfs2/glock.c ++++ b/fs/gfs2/glock.c +@@ -1552,6 +1552,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); +@@ -1597,7 +1598,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-5.4/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch b/queue-5.4/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch new file mode 100644 index 00000000000..e8cbb436261 --- /dev/null +++ b/queue-5.4/gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch @@ -0,0 +1,39 @@ +From 9e7855746160e13f539e56459467b44d87e563bc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 May 2021 12:25:59 +0200 +Subject: gfs2: Prevent direct-I/O write fallback errors from getting lost + +From: Andreas Gruenbacher + +[ Upstream commit 43a511c44e58e357a687d61a20cf5ef1dc9e5a7c ] + +When a direct I/O write falls entirely and falls back to buffered I/O and the +buffered I/O fails, the write failed with return value 0 instead of the error +number reported by the buffered I/O. Fix that. + +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/file.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c +index 4a10b4e7092a..69c52edf5713 100644 +--- a/fs/gfs2/file.c ++++ b/fs/gfs2/file.c +@@ -875,8 +875,11 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from) + current->backing_dev_info = inode_to_bdi(inode); + buffered = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); + current->backing_dev_info = NULL; +- if (unlikely(buffered <= 0)) ++ if (unlikely(buffered <= 0)) { ++ if (!ret) ++ ret = buffered; + goto out_unlock; ++ } + + /* + * We need to ensure that the page cache pages are written to +-- +2.30.2 + diff --git a/queue-5.4/hid-add-bus_virtual-to-hid_connect-logging.patch b/queue-5.4/hid-add-bus_virtual-to-hid_connect-logging.patch new file mode 100644 index 00000000000..9b910f4c54f --- /dev/null +++ b/queue-5.4/hid-add-bus_virtual-to-hid_connect-logging.patch @@ -0,0 +1,36 @@ +From ae20c5dd34a44844ccce7e84401eedca83589149 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 8d202011b2db..550fff6e41ec 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -1998,6 +1998,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-5.4/hid-gt683r-add-missing-module_device_table.patch b/queue-5.4/hid-gt683r-add-missing-module_device_table.patch new file mode 100644 index 00000000000..66c328132ef --- /dev/null +++ b/queue-5.4/hid-gt683r-add-missing-module_device_table.patch @@ -0,0 +1,36 @@ +From 2ac7415f3a87b63a8c06984940ae6280a3aaaf92 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 898871c8c768..29ccb0accfba 100644 +--- a/drivers/hid/hid-gt683r.c ++++ b/drivers/hid/hid-gt683r.c +@@ -54,6 +54,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-5.4/hid-hid-input-add-mapping-for-emoji-picker-key.patch b/queue-5.4/hid-hid-input-add-mapping-for-emoji-picker-key.patch new file mode 100644 index 00000000000..4227adf8ffa --- /dev/null +++ b/queue-5.4/hid-hid-input-add-mapping-for-emoji-picker-key.patch @@ -0,0 +1,66 @@ +From 195dd1ba9cac86a9ceda9974c1e488e4f4bfaa5e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 10 Apr 2021 19:56:05 -0700 +Subject: HID: hid-input: add mapping for emoji picker key + +From: Dmitry Torokhov + +[ Upstream commit 7b229b13d78d112e2c5d4a60a3c6f602289959fa ] + +HUTRR101 added a new usage code for a key that is supposed to invoke and +dismiss an emoji picker widget to assist users to locate and enter emojis. + +This patch adds a new key definition KEY_EMOJI_PICKER and maps 0x0c/0x0d9 +usage code to this new keycode. Additionally hid-debug is adjusted to +recognize this new usage code as well. + +Signed-off-by: Dmitry Torokhov +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-input.c | 3 +++ + include/uapi/linux/input-event-codes.h | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c +index 9453147d020d..01135713e8f9 100644 +--- a/drivers/hid/hid-debug.c ++++ b/drivers/hid/hid-debug.c +@@ -929,6 +929,7 @@ static const char *keys[KEY_MAX + 1] = { + [KEY_APPSELECT] = "AppSelect", + [KEY_SCREENSAVER] = "ScreenSaver", + [KEY_VOICECOMMAND] = "VoiceCommand", ++ [KEY_EMOJI_PICKER] = "EmojiPicker", + [KEY_BRIGHTNESS_MIN] = "BrightnessMin", + [KEY_BRIGHTNESS_MAX] = "BrightnessMax", + [KEY_BRIGHTNESS_AUTO] = "BrightnessAuto", +diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c +index ec08895e7b1d..6d551ae251c0 100644 +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -957,6 +957,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel + + case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break; + case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break; ++ ++ case 0x0d9: map_key_clear(KEY_EMOJI_PICKER); break; ++ + case 0x0e0: map_abs_clear(ABS_VOLUME); break; + case 0x0e2: map_key_clear(KEY_MUTE); break; + case 0x0e5: map_key_clear(KEY_BASSBOOST); break; +diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h +index 472cd5bc5567..311a57f3e01a 100644 +--- a/include/uapi/linux/input-event-codes.h ++++ b/include/uapi/linux/input-event-codes.h +@@ -607,6 +607,7 @@ + #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ + #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ + #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ ++#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ + + #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ + #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +-- +2.30.2 + diff --git a/queue-5.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch b/queue-5.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch new file mode 100644 index 00000000000..e10c56284d2 --- /dev/null +++ b/queue-5.4/hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch @@ -0,0 +1,53 @@ +From ac22bfefc17babb00d9fda43dbbfdebcd74363f1 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 3dd7d3246737..f9983145d4e7 100644 +--- a/drivers/hid/hid-sensor-hub.c ++++ b/drivers/hid/hid-sensor-hub.c +@@ -210,16 +210,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-5.4/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch b/queue-5.4/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch new file mode 100644 index 00000000000..6f5bb650521 --- /dev/null +++ b/queue-5.4/hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch @@ -0,0 +1,48 @@ +From 02d20e7a7edc4dc347fa84484b0166de8f366957 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Mar 2021 18:42:08 +0100 +Subject: HID: multitouch: set Stylus suffix for Stylus-application devices, + too +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ahelenia Ziemiańska + +[ Upstream commit bc8b796f618c3ccb0a2a8ed1e96c00a1a7849415 ] + +This re-adds the suffix to Win8 stylus-on-touchscreen devices, +now that they aren't erroneously marked as MT + +Signed-off-by: Ahelenia Ziemiańska +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-multitouch.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c +index f290ba856323..37270b8f4e58 100644 +--- a/drivers/hid/hid-multitouch.c ++++ b/drivers/hid/hid-multitouch.c +@@ -1587,13 +1587,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi) + /* we do not set suffix = "Touchscreen" */ + hi->input->name = hdev->name; + break; +- case HID_DG_STYLUS: +- /* force BTN_STYLUS to allow tablet matching in udev */ +- __set_bit(BTN_STYLUS, hi->input->keybit); +- break; + case HID_VD_ASUS_CUSTOM_MEDIA_KEYS: + suffix = "Custom Media Keys"; + break; ++ case HID_DG_STYLUS: ++ /* force BTN_STYLUS to allow tablet matching in udev */ ++ __set_bit(BTN_STYLUS, hi->input->keybit); ++ fallthrough; + case HID_DG_PEN: + suffix = "Stylus"; + break; +-- +2.30.2 + diff --git a/queue-5.4/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch b/queue-5.4/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch new file mode 100644 index 00000000000..a9fd661ec92 --- /dev/null +++ b/queue-5.4/hid-quirks-add-quirk-for-lenovo-optical-mouse.patch @@ -0,0 +1,57 @@ +From ebbd4b802fb0d79e46b2c9d44c0032cd58216d22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Apr 2021 11:50:39 -0700 +Subject: HID: quirks: Add quirk for Lenovo optical mouse + +From: Saeed Mirzamohammadi + +[ Upstream commit 3b2520076822f15621509a6da3bc4a8636cd33b4 ] + +The Lenovo optical mouse with vendor id of 0x17ef and product id of +0x600e experiences disconnecting issues every 55 seconds: + +[38565.706242] usb 1-1.4: Product: Lenovo Optical Mouse +[38565.728603] input: Lenovo Optical Mouse as /devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/1-1.4/1-1.4:1.0/0003:17EF:600E.029A/input/input665 +[38565.755949] hid-generic 0003:17EF:600E.029A: input,hidraw1: USB HID v1.11 Mouse [Lenovo Optical Mouse] on usb-0000:01:00.0-1.4/input0 +[38619.360692] usb 1-1.4: USB disconnect, device number 48 +[38620.864990] usb 1-1.4: new low-speed USB device number 49 using xhci_hcd +[38620.984011] usb 1-1.4: New USB device found, idVendor=17ef,idProduct=600e, bcdDevice= 1.00 +[38620.998117] usb 1-1.4: New USB device strings: Mfr=0, Product=2,SerialNumber=0 + +This adds HID_QUIRK_ALWAYS_POLL for this device in order to work properly. + +Signed-off-by: Saeed Mirzamohammadi +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index ec1b9555d10e..6ed6158d4f73 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -741,6 +741,7 @@ + #define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085 + #define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3 + #define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5 ++#define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E 0x600e + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D 0x608d + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019 0x6019 + #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E 0x602e +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index 4e7a89790746..efc9d0d28170 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -110,6 +110,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_602E), HID_QUIRK_ALWAYS_POLL }, +-- +2.30.2 + diff --git a/queue-5.4/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch b/queue-5.4/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch new file mode 100644 index 00000000000..dbf3034690e --- /dev/null +++ b/queue-5.4/hid-quirks-set-increment_usage_on_duplicate-for-sait.patch @@ -0,0 +1,51 @@ +From d18a8871d6f3302c093d03dd679877b092b039f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Mar 2021 09:10:02 -0700 +Subject: HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 + +From: Nirenjan Krishnan + +[ Upstream commit 25bdbfbb2d8331a67824dd03d0087e9c98835f3a ] + +The Saitek X65 joystick has a pair of axes that were used as mouse +pointer controls by the Windows driver. The corresponding usage page is +the Game Controls page, which is not recognized by the generic HID +driver, and therefore, both axes get mapped to ABS_MISC. The quirk makes +the second axis get mapped to ABS_MISC+1, and therefore made available +separately. + +Signed-off-by: Nirenjan Krishnan +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 1bfa690143d7..ec1b9555d10e 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -1028,6 +1028,7 @@ + #define USB_DEVICE_ID_SAITEK_X52 0x075c + #define USB_DEVICE_ID_SAITEK_X52_2 0x0255 + #define USB_DEVICE_ID_SAITEK_X52_PRO 0x0762 ++#define USB_DEVICE_ID_SAITEK_X65 0x0b6a + + #define USB_VENDOR_ID_SAMSUNG 0x0419 + #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index f35d919c4eba..4e7a89790746 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -158,6 +158,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_2), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X52_PRO), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_X65), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD2), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET }, +-- +2.30.2 + diff --git a/queue-5.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch b/queue-5.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch new file mode 100644 index 00000000000..977516fde23 --- /dev/null +++ b/queue-5.4/hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch @@ -0,0 +1,59 @@ +From 5aff9d7ced96d99a72358a5d66ec502425575abd 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 17a638f15082..1cfbbaf6901d 100644 +--- a/drivers/hid/usbhid/hid-core.c ++++ b/drivers/hid/usbhid/hid-core.c +@@ -374,7 +374,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 ae906deb42e8..85bedeb9ca9f 100644 +--- a/include/linux/hid.h ++++ b/include/linux/hid.h +@@ -1154,8 +1154,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-5.4/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch b/queue-5.4/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch new file mode 100644 index 00000000000..87b598c7d38 --- /dev/null +++ b/queue-5.4/net-ieee802154-fix-null-deref-in-parse-dev-addr.patch @@ -0,0 +1,53 @@ +From 4dc4f50a9a43199d95820033711de4852a854105 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Apr 2021 00:02:13 -0400 +Subject: net: ieee802154: fix null deref in parse dev addr + +From: Dan Robertson + +[ Upstream commit 9fdd04918a452980631ecc499317881c1d120b70 ] + +Fix a logic error that could result in a null deref if the user sets +the mode incorrectly for the given addr type. + +Signed-off-by: Dan Robertson +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20210423040214.15438-2-dan@dlrobertson.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + net/ieee802154/nl802154.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c +index 328bb9f5342e..b2ba1d2556f1 100644 +--- a/net/ieee802154/nl802154.c ++++ b/net/ieee802154/nl802154.c +@@ -1314,19 +1314,20 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla, + if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla, nl802154_dev_addr_policy, NULL)) + return -EINVAL; + +- if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || +- !attrs[NL802154_DEV_ADDR_ATTR_MODE] || +- !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] || +- attrs[NL802154_DEV_ADDR_ATTR_EXTENDED])) ++ if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || !attrs[NL802154_DEV_ADDR_ATTR_MODE]) + return -EINVAL; + + addr->pan_id = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_PAN_ID]); + addr->mode = nla_get_u32(attrs[NL802154_DEV_ADDR_ATTR_MODE]); + switch (addr->mode) { + case NL802154_DEV_ADDR_SHORT: ++ if (!attrs[NL802154_DEV_ADDR_ATTR_SHORT]) ++ return -EINVAL; + addr->short_addr = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_SHORT]); + break; + case NL802154_DEV_ADDR_EXTENDED: ++ if (!attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]) ++ return -EINVAL; + addr->extended_addr = nla_get_le64(attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]); + break; + default: +-- +2.30.2 + diff --git a/queue-5.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch b/queue-5.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch new file mode 100644 index 00000000000..299ca563e1b --- /dev/null +++ b/queue-5.4/net-ipconfig-don-t-override-command-line-hostnames-o.patch @@ -0,0 +1,62 @@ +From f3d85b198b885e570309b1f60baeb7415753047a 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 9bcca08efec9..c05ad600a4ff 100644 +--- a/net/ipv4/ipconfig.c ++++ b/net/ipv4/ipconfig.c +@@ -870,7 +870,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) + { +@@ -919,12 +919,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-5.4/net-return-the-correct-errno-code.patch b/queue-5.4/net-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..6264575886d --- /dev/null +++ b/queue-5.4/net-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From e7a3e36524b37dde3e773dda6cca3932271eb497 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 c848bcb517f3..f5b88166c44a 100644 +--- a/net/compat.c ++++ b/net/compat.c +@@ -160,7 +160,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-5.4/net-x25-return-the-correct-errno-code.patch b/queue-5.4/net-x25-return-the-correct-errno-code.patch new file mode 100644 index 00000000000..14d869d3491 --- /dev/null +++ b/queue-5.4/net-x25-return-the-correct-errno-code.patch @@ -0,0 +1,34 @@ +From ebe9a11d8f115f5d89ad12708e1a514c719d84f3 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 cb1f5016c433..d8d603aa4887 100644 +--- a/net/x25/af_x25.c ++++ b/net/x25/af_x25.c +@@ -546,7 +546,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-5.4/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch b/queue-5.4/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch new file mode 100644 index 00000000000..88fcb7ac155 --- /dev/null +++ b/queue-5.4/nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch @@ -0,0 +1,39 @@ +From 55f7439ef4ae34d71fef21f7d440d364d5a1137e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:17 +0200 +Subject: nvme-loop: check for NVME_LOOP_Q_LIVE in + nvme_loop_destroy_admin_queue() + +From: Hannes Reinecke + +[ Upstream commit 4237de2f73a669e4f89ac0aa2b44fb1a1d9ec583 ] + +We need to check the NVME_LOOP_Q_LIVE flag in +nvme_loop_destroy_admin_queue() to protect against duplicate +invocations eg during concurrent reset and remove calls. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index f752e9432676..f657a12bf1fe 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -252,7 +252,8 @@ static const struct blk_mq_ops nvme_loop_admin_mq_ops = { + + static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl) + { +- clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags); ++ if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags)) ++ return; + nvmet_sq_destroy(&ctrl->queues[0].nvme_sq); + blk_cleanup_queue(ctrl->ctrl.admin_q); + blk_cleanup_queue(ctrl->ctrl.fabrics_q); +-- +2.30.2 + diff --git a/queue-5.4/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch b/queue-5.4/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch new file mode 100644 index 00000000000..612a8a591de --- /dev/null +++ b/queue-5.4/nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch @@ -0,0 +1,36 @@ +From c00dc39ff235c02f6cbc08d4a52c96e2d1bbd901 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:16 +0200 +Subject: nvme-loop: clear NVME_LOOP_Q_LIVE when + nvme_loop_configure_admin_queue() fails + +From: Hannes Reinecke + +[ Upstream commit 1c5f8e882a05de5c011e8c3fbeceb0d1c590eb53 ] + +When the call to nvme_enable_ctrl() in nvme_loop_configure_admin_queue() +fails the NVME_LOOP_Q_LIVE flag is not cleared. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index b4f5503ae570..f752e9432676 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -395,6 +395,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) + return 0; + + out_cleanup_queue: ++ clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags); + blk_cleanup_queue(ctrl->ctrl.admin_q); + out_cleanup_fabrics_q: + blk_cleanup_queue(ctrl->ctrl.fabrics_q); +-- +2.30.2 + diff --git a/queue-5.4/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch b/queue-5.4/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch new file mode 100644 index 00000000000..bee33bda3c5 --- /dev/null +++ b/queue-5.4/nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch @@ -0,0 +1,37 @@ +From a7b57c400054989c22c7e652492892832597430f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 17:23:15 +0200 +Subject: nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() + +From: Hannes Reinecke + +[ Upstream commit a6c144f3d2e230f2b3ac5ed8c51e0f0391556197 ] + +The queue count is increased in nvme_loop_init_io_queues(), so we +need to reset it to 1 at the end of nvme_loop_destroy_io_queues(). +Otherwise the function is not re-entrant safe, and crash will happen +during concurrent reset and remove calls. + +Signed-off-by: Hannes Reinecke +Reviewed-by: Chaitanya Kulkarni +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + drivers/nvme/target/loop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c +index 82b87a4c50f6..b4f5503ae570 100644 +--- a/drivers/nvme/target/loop.c ++++ b/drivers/nvme/target/loop.c +@@ -288,6 +288,7 @@ static void nvme_loop_destroy_io_queues(struct nvme_loop_ctrl *ctrl) + clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[i].flags); + nvmet_sq_destroy(&ctrl->queues[i].nvme_sq); + } ++ ctrl->ctrl.queue_count = 1; + } + + static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl) +-- +2.30.2 + diff --git a/queue-5.4/riscv-use-mno-relax-when-using-lld-linker.patch b/queue-5.4/riscv-use-mno-relax-when-using-lld-linker.patch new file mode 100644 index 00000000000..c13b0a06f94 --- /dev/null +++ b/queue-5.4/riscv-use-mno-relax-when-using-lld-linker.patch @@ -0,0 +1,51 @@ +From 1407a9760dc1ebc5aad764bea2695cffea6f95c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 May 2021 14:37:41 -0700 +Subject: riscv: Use -mno-relax when using lld linker + +From: Khem Raj + +[ Upstream commit ec3a5cb61146c91f0f7dcec8b7e7157a4879a9ee ] + +lld does not implement the RISCV relaxation optimizations like GNU ld +therefore disable it when building with lld, Also pass it to +assembler when using external GNU assembler ( LLVM_IAS != 1 ), this +ensures that relevant assembler option is also enabled along. if these +options are not used then we see following relocations in objects + +0000000000000000 R_RISCV_ALIGN *ABS*+0x0000000000000002 + +These are then rejected by lld +ld.lld: error: capability.c:(.fixup+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax but the .o is already compiled with -mno-relax + +Signed-off-by: Khem Raj +Reviewed-by: Nathan Chancellor +Signed-off-by: Palmer Dabbelt +Signed-off-by: Sasha Levin +--- + arch/riscv/Makefile | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index f5e914210245..1cbe0ad78b0f 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -34,6 +34,15 @@ else + KBUILD_LDFLAGS += -melf32lriscv + endif + ++ifeq ($(CONFIG_LD_IS_LLD),y) ++ KBUILD_CFLAGS += -mno-relax ++ KBUILD_AFLAGS += -mno-relax ++ifneq ($(LLVM_IAS),1) ++ KBUILD_CFLAGS += -Wa,-mno-relax ++ KBUILD_AFLAGS += -Wa,-mno-relax ++endif ++endif ++ + # ISA string setting + riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima + riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima +-- +2.30.2 + diff --git a/queue-5.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch b/queue-5.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch new file mode 100644 index 00000000000..fc5713235d1 --- /dev/null +++ b/queue-5.4/rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch @@ -0,0 +1,44 @@ +From 1ecd20664ca3762a72191209d445daacd6bcb0a6 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 73c09b5864d7..bdeb169a7a99 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -4535,8 +4535,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-5.4/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch b/queue-5.4/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch new file mode 100644 index 00000000000..5993cc1198f --- /dev/null +++ b/queue-5.4/scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch @@ -0,0 +1,95 @@ +From 9bebe040736c722c4551dbe4bf7b532fc2c15b0f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 16:34:40 +0200 +Subject: scsi: qedf: Do not put host in qedf_vport_create() unconditionally + +From: Daniel Wagner + +[ Upstream commit 79c932cd6af9829432888c4a0001d01793a09f12 ] + +Do not drop reference count on vn_port->host in qedf_vport_create() +unconditionally. Instead drop the reference count in qedf_vport_destroy(). + +Link: https://lore.kernel.org/r/20210521143440.84816-1-dwagner@suse.de +Reported-by: Javed Hasan +Signed-off-by: Daniel Wagner +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qedf/qedf_main.c | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c +index 9c0955c334e3..7a6306f8483e 100644 +--- a/drivers/scsi/qedf/qedf_main.c ++++ b/drivers/scsi/qedf/qedf_main.c +@@ -1729,22 +1729,20 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf)); + QEDF_WARN(&(base_qedf->dbg_ctx), "Failed to create vport, " + "WWPN (0x%s) already exists.\n", buf); +- goto err1; ++ return rc; + } + + if (atomic_read(&base_qedf->link_state) != QEDF_LINK_UP) { + QEDF_WARN(&(base_qedf->dbg_ctx), "Cannot create vport " + "because link is not up.\n"); +- rc = -EIO; +- goto err1; ++ return -EIO; + } + + vn_port = libfc_vport_create(vport, sizeof(struct qedf_ctx)); + if (!vn_port) { + QEDF_WARN(&(base_qedf->dbg_ctx), "Could not create lport " + "for vport.\n"); +- rc = -ENOMEM; +- goto err1; ++ return -ENOMEM; + } + + fcoe_wwn_to_str(vport->port_name, buf, sizeof(buf)); +@@ -1768,7 +1766,7 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + if (rc) { + QEDF_ERR(&(base_qedf->dbg_ctx), "Could not allocate memory " + "for lport stats.\n"); +- goto err2; ++ goto err; + } + + fc_set_wwnn(vn_port, vport->node_name); +@@ -1786,7 +1784,7 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + if (rc) { + QEDF_WARN(&base_qedf->dbg_ctx, + "Error adding Scsi_Host rc=0x%x.\n", rc); +- goto err2; ++ goto err; + } + + /* Set default dev_loss_tmo based on module parameter */ +@@ -1827,9 +1825,10 @@ static int qedf_vport_create(struct fc_vport *vport, bool disabled) + vport_qedf->dbg_ctx.host_no = vn_port->host->host_no; + vport_qedf->dbg_ctx.pdev = base_qedf->pdev; + +-err2: ++ return 0; ++ ++err: + scsi_host_put(vn_port->host); +-err1: + return rc; + } + +@@ -1870,8 +1869,7 @@ static int qedf_vport_destroy(struct fc_vport *vport) + fc_lport_free_stats(vn_port); + + /* Release Scsi_Host */ +- if (vn_port->host) +- scsi_host_put(vn_port->host); ++ scsi_host_put(vn_port->host); + + out: + return 0; +-- +2.30.2 + diff --git a/queue-5.4/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch b/queue-5.4/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch new file mode 100644 index 00000000000..a177a807f5d --- /dev/null +++ b/queue-5.4/scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch @@ -0,0 +1,34 @@ +From 5f67f84f1c25323896bb7af8965df40e25cee1d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jun 2021 13:52:14 -0400 +Subject: scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V + +From: Ewan D. Milne + +[ Upstream commit e57f5cd99ca60cddf40201b0f4ced9f1938e299c ] + +Apparently some arrays are now returning "HPE" as the vendor. + +Link: https://lore.kernel.org/r/20210601175214.25719-1-emilne@redhat.com +Signed-off-by: Ewan D. Milne +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_devinfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c +index fb5a7832353c..7f76bf5cc8a8 100644 +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -184,6 +184,7 @@ static struct { + {"HP", "C3323-300", "4269", BLIST_NOTQ}, + {"HP", "C5713A", NULL, BLIST_NOREPORTLUN}, + {"HP", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2}, ++ {"HPE", "OPEN-", "*", BLIST_REPORTLUN2 | BLIST_TRY_VPD_PAGES}, + {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN}, + {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, + {"IBM", "2105", NULL, BLIST_RETRY_HWERROR}, +-- +2.30.2 + diff --git a/queue-5.4/scsi-target-core-fix-warning-on-realtime-kernels.patch b/queue-5.4/scsi-target-core-fix-warning-on-realtime-kernels.patch new file mode 100644 index 00000000000..f040488f92d --- /dev/null +++ b/queue-5.4/scsi-target-core-fix-warning-on-realtime-kernels.patch @@ -0,0 +1,43 @@ +From 246a27581e6a6e99ae71ce034360885db4d6a294 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 a16835c0bb1d..5cf9e7677926 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -2993,9 +2993,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-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..10be89229a5 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1,28 @@ +net-ieee802154-fix-null-deref-in-parse-dev-addr.patch +hid-quirks-set-increment_usage_on_duplicate-for-sait.patch +hid-hid-input-add-mapping-for-emoji-picker-key.patch +hid-hid-sensor-hub-return-error-for-hid_set_field-fa.patch +hid-quirks-add-quirk-for-lenovo-optical-mouse.patch +hid-multitouch-set-stylus-suffix-for-stylus-applicat.patch +hid-add-bus_virtual-to-hid_connect-logging.patch +hid-usbhid-fix-info-leak-in-hid_submit_ctrl.patch +drm-tegra-sor-do-not-leak-runtime-pm-reference.patch +arm-omap2-fix-build-warning-when-mmc_omap-is-not-bui.patch +gfs2-prevent-direct-i-o-write-fallback-errors-from-g.patch +hid-gt683r-add-missing-module_device_table.patch +riscv-use-mno-relax-when-using-lld-linker.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 +scsi-qedf-do-not-put-host-in-qedf_vport_create-uncon.patch +scsi-scsi_devinfo-add-blacklist-entry-for-hpe-open-v.patch +nvme-loop-reset-queue-count-to-1-in-nvme_loop_destro.patch +nvme-loop-clear-nvme_loop_q_live-when-nvme_loop_conf.patch +nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch +net-ipconfig-don-t-override-command-line-hostnames-o.patch +drm-amd-display-allow-bandwidth-validation-for-0-str.patch +drm-amd-display-fix-overlay-validation-by-considerin.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