From: Greg Kroah-Hartman Date: Mon, 18 Oct 2021 11:32:51 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.14.252~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efbe34f1f638a0578c0c23b93dfe7832803163ff;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch drm-msm-mdp5-fix-cursor-related-warnings.patch mqprio-correct-stats-in-mqprio_dump_class_stats.patch nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch nfc-digital-fix-possible-memory-leak-in-digital_tg_listen_mdaa.patch nfc-fix-error-handling-of-nfc_proto_register.patch pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch qed-fix-missing-error-code-in-qed_slowpath_start.patch r8152-select-crc32-and-crypto-crypto_hash-crypto_sha256.patch --- diff --git a/queue-4.19/acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch b/queue-4.19/acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch new file mode 100644 index 00000000000..42e165ea144 --- /dev/null +++ b/queue-4.19/acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch @@ -0,0 +1,52 @@ +From 596143e3aec35c93508d6b7a05ddc999ee209b61 Mon Sep 17 00:00:00 2001 +From: Jackie Liu +Date: Mon, 23 Aug 2021 17:25:26 +0800 +Subject: acpi/arm64: fix next_platform_timer() section mismatch error + +From: Jackie Liu + +commit 596143e3aec35c93508d6b7a05ddc999ee209b61 upstream. + +Fix modpost Section mismatch error in next_platform_timer(). + + [...] + WARNING: modpost: vmlinux.o(.text.unlikely+0x26e60): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc + The function next_platform_timer() references + the variable __initdata acpi_gtdt_desc. + This is often because next_platform_timer lacks a __initdata + annotation or the annotation of acpi_gtdt_desc is wrong. + + WARNING: modpost: vmlinux.o(.text.unlikely+0x26e64): Section mismatch in reference from the function next_platform_timer() to the variable .init.data:acpi_gtdt_desc + The function next_platform_timer() references + the variable __initdata acpi_gtdt_desc. + This is often because next_platform_timer lacks a __initdata + annotation or the annotation of acpi_gtdt_desc is wrong. + + ERROR: modpost: Section mismatches detected. + Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them. + make[1]: *** [scripts/Makefile.modpost:59: vmlinux.symvers] Error 1 + make[1]: *** Deleting file 'vmlinux.symvers' + make: *** [Makefile:1176: vmlinux] Error 2 + [...] + +Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver") +Signed-off-by: Jackie Liu +Acked-by: Hanjun Guo +Link: https://lore.kernel.org/r/20210823092526.2407526-1-liu.yun@linux.dev +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/arm64/gtdt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/arm64/gtdt.c ++++ b/drivers/acpi/arm64/gtdt.c +@@ -39,7 +39,7 @@ struct acpi_gtdt_descriptor { + + static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata; + +-static inline void *next_platform_timer(void *platform_timer) ++static inline __init void *next_platform_timer(void *platform_timer) + { + struct acpi_gtdt_header *gh = platform_timer; + diff --git a/queue-4.19/drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch b/queue-4.19/drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch new file mode 100644 index 00000000000..b83263a5ca9 --- /dev/null +++ b/queue-4.19/drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch @@ -0,0 +1,37 @@ +From 739b4e7756d3301dd673ca517afca46a5f635562 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Fri, 1 Oct 2021 15:33:08 +0300 +Subject: drm/msm/dsi: Fix an error code in msm_dsi_modeset_init() + +From: Dan Carpenter + +commit 739b4e7756d3301dd673ca517afca46a5f635562 upstream. + +Return an error code if msm_dsi_manager_validate_current_config(). +Don't return success. + +Fixes: 8b03ad30e314 ("drm/msm/dsi: Use one connector for dual DSI mode") +Signed-off-by: Dan Carpenter +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20211001123308.GF2283@kili +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Rob Clark +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/msm/dsi/dsi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/msm/dsi/dsi.c ++++ b/drivers/gpu/drm/msm/dsi/dsi.c +@@ -208,8 +208,10 @@ int msm_dsi_modeset_init(struct msm_dsi + goto fail; + } + +- if (!msm_dsi_manager_validate_current_config(msm_dsi->id)) ++ if (!msm_dsi_manager_validate_current_config(msm_dsi->id)) { ++ ret = -EINVAL; + goto fail; ++ } + + msm_dsi->encoder = encoder; + diff --git a/queue-4.19/drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch b/queue-4.19/drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch new file mode 100644 index 00000000000..020ecf271f4 --- /dev/null +++ b/queue-4.19/drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch @@ -0,0 +1,34 @@ +From c8f01ffc83923a91e8087aaa077de13354a7aa59 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Fri, 1 Oct 2021 15:34:09 +0300 +Subject: drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling + +From: Dan Carpenter + +commit c8f01ffc83923a91e8087aaa077de13354a7aa59 upstream. + +This disables a lock which wasn't enabled and it does not disable +the first lock in the array. + +Fixes: 6e0eb52eba9e ("drm/msm/dsi: Parse bus clocks from a list") +Signed-off-by: Dan Carpenter +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20211001123409.GG2283@kili +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Rob Clark +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/msm/dsi/dsi_host.c ++++ b/drivers/gpu/drm/msm/dsi/dsi_host.c +@@ -468,7 +468,7 @@ static int dsi_bus_clk_enable(struct msm + + return 0; + err: +- for (; i > 0; i--) ++ while (--i >= 0) + clk_disable_unprepare(msm_host->bus_clks[i]); + + return ret; diff --git a/queue-4.19/drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch b/queue-4.19/drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch new file mode 100644 index 00000000000..309f0b88a98 --- /dev/null +++ b/queue-4.19/drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch @@ -0,0 +1,44 @@ +From 2133c4fc8e1348dcb752f267a143fe2254613b34 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Wed, 29 Sep 2021 13:18:57 +0100 +Subject: drm/msm: Fix null pointer dereference on pointer edp + +From: Colin Ian King + +commit 2133c4fc8e1348dcb752f267a143fe2254613b34 upstream. + +The initialization of pointer dev dereferences pointer edp before +edp is null checked, so there is a potential null pointer deference +issue. Fix this by only dereferencing edp after edp has been null +checked. + +Addresses-Coverity: ("Dereference before null check") +Fixes: ab5b0107ccf3 ("drm/msm: Initial add eDP support in msm drm driver (v5)") +Signed-off-by: Colin Ian King +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20210929121857.213922-1-colin.king@canonical.com +Signed-off-by: Rob Clark +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c ++++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c +@@ -1090,7 +1090,7 @@ void msm_edp_ctrl_power(struct edp_ctrl + int msm_edp_ctrl_init(struct msm_edp *edp) + { + struct edp_ctrl *ctrl = NULL; +- struct device *dev = &edp->pdev->dev; ++ struct device *dev; + int ret; + + if (!edp) { +@@ -1098,6 +1098,7 @@ int msm_edp_ctrl_init(struct msm_edp *ed + return -EINVAL; + } + ++ dev = &edp->pdev->dev; + ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL); + if (!ctrl) + return -ENOMEM; diff --git a/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch b/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch new file mode 100644 index 00000000000..d96b4c33904 --- /dev/null +++ b/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch @@ -0,0 +1,144 @@ +From c491a0c7bbf3a64732cb8414021429d15ec08eec Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov +Date: Sat, 25 Sep 2021 22:28:24 +0300 +Subject: drm/msm/mdp5: fix cursor-related warnings + +From: Dmitry Baryshkov + +commit c491a0c7bbf3a64732cb8414021429d15ec08eec upstream. + +Since f35a2a99100f ("drm/encoder: make encoder control functions +optional") drm_mode_config_validate would print warnings if both cursor +plane and cursor functions are provided. Restore separate set of +drm_crtc_funcs to be used if separate cursor plane is provided. + +[ 6.556046] ------------[ cut here ]------------ +[ 6.556071] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_set func +[ 6.556091] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:648 drm_mode_config_validate+0x238/0x4d0 +[ 6.567453] Modules linked in: +[ 6.577604] CPU: 1 PID: 76 Comm: kworker/u8:2 Not tainted 5.15.0-rc1-dirty #43 +[ 6.580557] Hardware name: Qualcomm Technologies, Inc. DB820c (DT) +[ 6.587763] Workqueue: events_unbound deferred_probe_work_func +[ 6.593926] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 6.599740] pc : drm_mode_config_validate+0x238/0x4d0 +[ 6.606596] lr : drm_mode_config_validate+0x238/0x4d0 +[ 6.611804] sp : ffff8000121b3980 +[ 6.616838] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001 +[ 6.620140] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8 +[ 6.627258] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001 +[ 6.634376] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff +[ 6.641494] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c78709 +[ 6.648613] x14: 0000000000000000 x13: ffff800011a22850 x12: 00000000000009ab +[ 6.655730] x11: 0000000000000339 x10: ffff800011a22850 x9 : ffff800011a22850 +[ 6.662848] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850 +[ 6.669966] x5 : 000000000000bff4 x4 : 40000000fffff339 x3 : 0000000000000000 +[ 6.677084] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800 +[ 6.684205] Call trace: +[ 6.691319] drm_mode_config_validate+0x238/0x4d0 +[ 6.693577] drm_dev_register+0x17c/0x210 +[ 6.698435] msm_drm_bind+0x4b4/0x694 +[ 6.702429] try_to_bring_up_master+0x164/0x1d0 +[ 6.706075] __component_add+0xa0/0x170 +[ 6.710415] component_add+0x14/0x20 +[ 6.714234] msm_hdmi_dev_probe+0x1c/0x2c +[ 6.718053] platform_probe+0x68/0xe0 +[ 6.721959] really_probe.part.0+0x9c/0x30c +[ 6.725606] __driver_probe_device+0x98/0x144 +[ 6.729600] driver_probe_device+0xc8/0x15c +[ 6.734114] __device_attach_driver+0xb4/0x120 +[ 6.738106] bus_for_each_drv+0x78/0xd0 +[ 6.742619] __device_attach+0xdc/0x184 +[ 6.746351] device_initial_probe+0x14/0x20 +[ 6.750172] bus_probe_device+0x9c/0xa4 +[ 6.754337] deferred_probe_work_func+0x88/0xc0 +[ 6.758158] process_one_work+0x1d0/0x370 +[ 6.762671] worker_thread+0x2c8/0x470 +[ 6.766839] kthread+0x15c/0x170 +[ 6.770483] ret_from_fork+0x10/0x20 +[ 6.773870] ---[ end trace 5884eb76cd26d274 ]--- +[ 6.777500] ------------[ cut here ]------------ +[ 6.782043] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_move func +[ 6.782063] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:654 drm_mode_config_validate+0x290/0x4d0 +[ 6.794362] Modules linked in: +[ 6.804600] CPU: 1 PID: 76 Comm: kworker/u8:2 Tainted: G W 5.15.0-rc1-dirty #43 +[ 6.807555] Hardware name: Qualcomm Technologies, Inc. DB820c (DT) +[ 6.816148] Workqueue: events_unbound deferred_probe_work_func +[ 6.822311] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 6.828126] pc : drm_mode_config_validate+0x290/0x4d0 +[ 6.834981] lr : drm_mode_config_validate+0x290/0x4d0 +[ 6.840189] sp : ffff8000121b3980 +[ 6.845223] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001 +[ 6.848525] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8 +[ 6.855643] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001 +[ 6.862763] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff +[ 6.869879] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c790c2 +[ 6.876998] x14: 0000000000000000 x13: ffff800011a22850 x12: 0000000000000a2f +[ 6.884116] x11: 0000000000000365 x10: ffff800011a22850 x9 : ffff800011a22850 +[ 6.891234] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850 +[ 6.898351] x5 : 000000000000bff4 x4 : 40000000fffff365 x3 : 0000000000000000 +[ 6.905470] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800 +[ 6.912590] Call trace: +[ 6.919702] drm_mode_config_validate+0x290/0x4d0 +[ 6.921960] drm_dev_register+0x17c/0x210 +[ 6.926821] msm_drm_bind+0x4b4/0x694 +[ 6.930813] try_to_bring_up_master+0x164/0x1d0 +[ 6.934459] __component_add+0xa0/0x170 +[ 6.938799] component_add+0x14/0x20 +[ 6.942619] msm_hdmi_dev_probe+0x1c/0x2c +[ 6.946438] platform_probe+0x68/0xe0 +[ 6.950345] really_probe.part.0+0x9c/0x30c +[ 6.953991] __driver_probe_device+0x98/0x144 +[ 6.957984] driver_probe_device+0xc8/0x15c +[ 6.962498] __device_attach_driver+0xb4/0x120 +[ 6.966492] bus_for_each_drv+0x78/0xd0 +[ 6.971004] __device_attach+0xdc/0x184 +[ 6.974737] device_initial_probe+0x14/0x20 +[ 6.978556] bus_probe_device+0x9c/0xa4 +[ 6.982722] deferred_probe_work_func+0x88/0xc0 +[ 6.986543] process_one_work+0x1d0/0x370 +[ 6.991057] worker_thread+0x2c8/0x470 +[ 6.995223] kthread+0x15c/0x170 +[ 6.998869] ret_from_fork+0x10/0x20 +[ 7.002255] ---[ end trace 5884eb76cd26d275 ]--- + +Fixes: aa649e875daf ("drm/msm/mdp5: mdp5_crtc: Restore cursor state only if LM cursors are enabled") +Signed-off-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20210925192824.3416259-1-dmitry.baryshkov@linaro.org +Signed-off-by: Rob Clark +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c ++++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +@@ -1053,6 +1053,20 @@ static void mdp5_crtc_destroy_state(stru + kfree(mdp5_cstate); + } + ++static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { ++ .set_config = drm_atomic_helper_set_config, ++ .destroy = mdp5_crtc_destroy, ++ .page_flip = drm_atomic_helper_page_flip, ++ .reset = mdp5_crtc_reset, ++ .atomic_duplicate_state = mdp5_crtc_duplicate_state, ++ .atomic_destroy_state = mdp5_crtc_destroy_state, ++ .atomic_print_state = mdp5_crtc_atomic_print_state, ++ .get_vblank_counter = mdp5_crtc_get_vblank_counter, ++ .enable_vblank = msm_crtc_enable_vblank, ++ .disable_vblank = msm_crtc_disable_vblank, ++ .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, ++}; ++ + static const struct drm_crtc_funcs mdp5_crtc_funcs = { + .set_config = drm_atomic_helper_set_config, + .destroy = mdp5_crtc_destroy, +@@ -1236,6 +1250,8 @@ struct drm_crtc *mdp5_crtc_init(struct d + mdp5_crtc->lm_cursor_enabled = cursor_plane ? false : true; + + drm_crtc_init_with_planes(dev, crtc, plane, cursor_plane, ++ cursor_plane ? ++ &mdp5_crtc_no_lm_cursor_funcs : + &mdp5_crtc_funcs, NULL); + + drm_flip_work_init(&mdp5_crtc->unref_cursor_work, diff --git a/queue-4.19/mqprio-correct-stats-in-mqprio_dump_class_stats.patch b/queue-4.19/mqprio-correct-stats-in-mqprio_dump_class_stats.patch new file mode 100644 index 00000000000..d0cfec2e156 --- /dev/null +++ b/queue-4.19/mqprio-correct-stats-in-mqprio_dump_class_stats.patch @@ -0,0 +1,80 @@ +From 14132690860e4d06aa3e1c4d7d8e9866ba7756dd Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Thu, 7 Oct 2021 19:49:57 +0200 +Subject: mqprio: Correct stats in mqprio_dump_class_stats(). + +From: Sebastian Andrzej Siewior + +commit 14132690860e4d06aa3e1c4d7d8e9866ba7756dd upstream. + +Introduction of lockless subqueues broke the class statistics. +Before the change stats were accumulated in `bstats' and `qstats' +on the stack which was then copied to struct gnet_dump. + +After the change the `bstats' and `qstats' are initialized to 0 +and never updated, yet still fed to gnet_dump. The code updates +the global qdisc->cpu_bstats and qdisc->cpu_qstats instead, +clobbering them. Most likely a copy-paste error from the code in +mqprio_dump(). + +__gnet_stats_copy_basic() and __gnet_stats_copy_queue() accumulate +the values for per-CPU case but for global stats they overwrite +the value, so only stats from the last loop iteration / tc end up +in sch->[bq]stats. + +Use the on-stack [bq]stats variables again and add the stats manually +in the global case. + +Fixes: ce679e8df7ed2 ("net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio") +Cc: John Fastabend +Signed-off-by: Sebastian Andrzej Siewior +https://lore.kernel.org/all/20211007175000.2334713-2-bigeasy@linutronix.de/ +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/sch_mqprio.c | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +--- a/net/sched/sch_mqprio.c ++++ b/net/sched/sch_mqprio.c +@@ -531,22 +531,28 @@ static int mqprio_dump_class_stats(struc + for (i = tc.offset; i < tc.offset + tc.count; i++) { + struct netdev_queue *q = netdev_get_tx_queue(dev, i); + struct Qdisc *qdisc = rtnl_dereference(q->qdisc); +- struct gnet_stats_basic_cpu __percpu *cpu_bstats = NULL; +- struct gnet_stats_queue __percpu *cpu_qstats = NULL; + + spin_lock_bh(qdisc_lock(qdisc)); ++ + if (qdisc_is_percpu_stats(qdisc)) { +- cpu_bstats = qdisc->cpu_bstats; +- cpu_qstats = qdisc->cpu_qstats; +- } ++ qlen = qdisc_qlen_sum(qdisc); + +- qlen = qdisc_qlen_sum(qdisc); +- __gnet_stats_copy_basic(NULL, &sch->bstats, +- cpu_bstats, &qdisc->bstats); +- __gnet_stats_copy_queue(&sch->qstats, +- cpu_qstats, +- &qdisc->qstats, +- qlen); ++ __gnet_stats_copy_basic(NULL, &bstats, ++ qdisc->cpu_bstats, ++ &qdisc->bstats); ++ __gnet_stats_copy_queue(&qstats, ++ qdisc->cpu_qstats, ++ &qdisc->qstats, ++ qlen); ++ } else { ++ qlen += qdisc->q.qlen; ++ bstats.bytes += qdisc->bstats.bytes; ++ bstats.packets += qdisc->bstats.packets; ++ qstats.backlog += qdisc->qstats.backlog; ++ qstats.drops += qdisc->qstats.drops; ++ qstats.requeues += qdisc->qstats.requeues; ++ qstats.overlimits += qdisc->qstats.overlimits; ++ } + spin_unlock_bh(qdisc_lock(qdisc)); + } + diff --git a/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch b/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch new file mode 100644 index 00000000000..58e3af6cd18 --- /dev/null +++ b/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch @@ -0,0 +1,39 @@ +From 291c932fc3692e4d211a445ba8aa35663831bac7 Mon Sep 17 00:00:00 2001 +From: Ziyang Xuan +Date: Wed, 13 Oct 2021 15:50:32 +0800 +Subject: NFC: digital: fix possible memory leak in digital_in_send_sdd_req() + +From: Ziyang Xuan + +commit 291c932fc3692e4d211a445ba8aa35663831bac7 upstream. + +'skb' is allocated in digital_in_send_sdd_req(), but not free when +digital_in_send_cmd() failed, which will cause memory leak. Fix it +by freeing 'skb' if digital_in_send_cmd() return failed. + +Fixes: 2c66daecc409 ("NFC Digital: Add NFC-A technology support") +Signed-off-by: Ziyang Xuan +Reviewed-by: Krzysztof Kozlowski +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/digital_technology.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/net/nfc/digital_technology.c ++++ b/net/nfc/digital_technology.c +@@ -474,8 +474,12 @@ static int digital_in_send_sdd_req(struc + skb_put_u8(skb, sel_cmd); + skb_put_u8(skb, DIGITAL_SDD_REQ_SEL_PAR); + +- return digital_in_send_cmd(ddev, skb, 30, digital_in_recv_sdd_res, +- target); ++ rc = digital_in_send_cmd(ddev, skb, 30, digital_in_recv_sdd_res, ++ target); ++ if (rc) ++ kfree_skb(skb); ++ ++ return rc; + } + + static void digital_in_recv_sens_res(struct nfc_digital_dev *ddev, void *arg, diff --git a/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_tg_listen_mdaa.patch b/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_tg_listen_mdaa.patch new file mode 100644 index 00000000000..825759eb5d7 --- /dev/null +++ b/queue-4.19/nfc-digital-fix-possible-memory-leak-in-digital_tg_listen_mdaa.patch @@ -0,0 +1,47 @@ +From 58e7dcc9ca29c14e44267a4d0ea61e3229124907 Mon Sep 17 00:00:00 2001 +From: Ziyang Xuan +Date: Wed, 13 Oct 2021 15:50:12 +0800 +Subject: NFC: digital: fix possible memory leak in digital_tg_listen_mdaa() + +From: Ziyang Xuan + +commit 58e7dcc9ca29c14e44267a4d0ea61e3229124907 upstream. + +'params' is allocated in digital_tg_listen_mdaa(), but not free when +digital_send_cmd() failed, which will cause memory leak. Fix it by +freeing 'params' if digital_send_cmd() return failed. + +Fixes: 1c7a4c24fbfd ("NFC Digital: Add target NFC-DEP support") +Signed-off-by: Ziyang Xuan +Reviewed-by: Krzysztof Kozlowski +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/digital_core.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/net/nfc/digital_core.c ++++ b/net/nfc/digital_core.c +@@ -286,6 +286,7 @@ int digital_tg_configure_hw(struct nfc_d + static int digital_tg_listen_mdaa(struct nfc_digital_dev *ddev, u8 rf_tech) + { + struct digital_tg_mdaa_params *params; ++ int rc; + + params = kzalloc(sizeof(*params), GFP_KERNEL); + if (!params) +@@ -300,8 +301,12 @@ static int digital_tg_listen_mdaa(struct + get_random_bytes(params->nfcid2 + 2, NFC_NFCID2_MAXSIZE - 2); + params->sc = DIGITAL_SENSF_FELICA_SC; + +- return digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, +- 500, digital_tg_recv_atr_req, NULL); ++ rc = digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, ++ 500, digital_tg_recv_atr_req, NULL); ++ if (rc) ++ kfree(params); ++ ++ return rc; + } + + static int digital_tg_listen_md(struct nfc_digital_dev *ddev, u8 rf_tech) diff --git a/queue-4.19/nfc-fix-error-handling-of-nfc_proto_register.patch b/queue-4.19/nfc-fix-error-handling-of-nfc_proto_register.patch new file mode 100644 index 00000000000..678dad72dcd --- /dev/null +++ b/queue-4.19/nfc-fix-error-handling-of-nfc_proto_register.patch @@ -0,0 +1,35 @@ +From 0911ab31896f0e908540746414a77dd63912748d Mon Sep 17 00:00:00 2001 +From: Ziyang Xuan +Date: Wed, 13 Oct 2021 11:49:32 +0800 +Subject: nfc: fix error handling of nfc_proto_register() + +From: Ziyang Xuan + +commit 0911ab31896f0e908540746414a77dd63912748d upstream. + +When nfc proto id is using, nfc_proto_register() return -EBUSY error +code, but forgot to unregister proto. Fix it by adding proto_unregister() +in the error handling case. + +Fixes: c7fe3b52c128 ("NFC: add NFC socket family") +Signed-off-by: Ziyang Xuan +Reviewed-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20211013034932.2833737-1-william.xuanziyang@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/af_nfc.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/net/nfc/af_nfc.c ++++ b/net/nfc/af_nfc.c +@@ -72,6 +72,9 @@ int nfc_proto_register(const struct nfc_ + proto_tab[nfc_proto->id] = nfc_proto; + write_unlock(&proto_tab_lock); + ++ if (rc) ++ proto_unregister(nfc_proto->proto); ++ + return rc; + } + EXPORT_SYMBOL(nfc_proto_register); diff --git a/queue-4.19/pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch b/queue-4.19/pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch new file mode 100644 index 00000000000..0e81ce72375 --- /dev/null +++ b/queue-4.19/pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch @@ -0,0 +1,41 @@ +From 013923477cb311293df9079332cf8b806ed0e6f2 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 6 Oct 2021 10:34:19 +0300 +Subject: pata_legacy: fix a couple uninitialized variable bugs + +From: Dan Carpenter + +commit 013923477cb311293df9079332cf8b806ed0e6f2 upstream. + +The last byte of "pad" is used without being initialized. + +Fixes: 55dba3120fbc ("libata: update ->data_xfer hook for ATAPI") +Signed-off-by: Dan Carpenter +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/ata/pata_legacy.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/ata/pata_legacy.c ++++ b/drivers/ata/pata_legacy.c +@@ -329,7 +329,8 @@ static unsigned int pdc_data_xfer_vlb(st + iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2); + + if (unlikely(slop)) { +- __le32 pad; ++ __le32 pad = 0; ++ + if (rw == READ) { + pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr)); + memcpy(buf + buflen - slop, &pad, slop); +@@ -719,7 +720,8 @@ static unsigned int vlb32_data_xfer(stru + ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2); + + if (unlikely(slop)) { +- __le32 pad; ++ __le32 pad = 0; ++ + if (rw == WRITE) { + memcpy(&pad, buf + buflen - slop, slop); + iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr); diff --git a/queue-4.19/platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch b/queue-4.19/platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch new file mode 100644 index 00000000000..82ac56dd1c7 --- /dev/null +++ b/queue-4.19/platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch @@ -0,0 +1,65 @@ +From 9b024201693e397441668cca0d2df7055fe572eb Mon Sep 17 00:00:00 2001 +From: Vadim Pasternak +Date: Mon, 27 Sep 2021 17:22:13 +0300 +Subject: platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() call + +From: Vadim Pasternak + +commit 9b024201693e397441668cca0d2df7055fe572eb upstream. + +Change kstrtou32() argument 'base' to be zero instead of 'len'. +It works by chance for setting one bit value, but it is not supposed to +work in case value passed to mlxreg_io_attr_store() is greater than 1. + +It works for example, for: +echo 1 > /sys/devices/platform/mlxplat/mlxreg-io/hwmon/.../jtag_enable +But it will fail for: +echo n > /sys/devices/platform/mlxplat/mlxreg-io/hwmon/.../jtag_enable, +where n > 1. + +The flow for input buffer conversion is as below: +_kstrtoull(const char *s, unsigned int base, unsigned long long *res) +calls: +rv = _parse_integer(s, base, &_res); + +For the second case, where n > 1: +- _parse_integer() converts 's' to 'val'. + For n=2, 'len' is set to 2 (string buffer is 0x32 0x0a), for n=3 + 'len' is set to 3 (string buffer 0x33 0x0a), etcetera. +- 'base' is equal or greater then '2' (length of input buffer). + +As a result, _parse_integer() exits with result zero (rv): + rv = 0; + while (1) { + ... + if (val >= base)-> (2 >= 2) + break; + ... + rv++; + ... + } + +And _kstrtoull() in their turn will fail: + if (rv == 0) + return -EINVAL; + +Fixes: 5ec4a8ace06c ("platform/mellanox: Introduce support for Mellanox register access driver") +Signed-off-by: Vadim Pasternak +Link: https://lore.kernel.org/r/20210927142214.2613929-2-vadimp@nvidia.com +Signed-off-by: Hans de Goede +Signed-off-by: Greg Kroah-Hartman +--- + drivers/platform/mellanox/mlxreg-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/platform/mellanox/mlxreg-io.c ++++ b/drivers/platform/mellanox/mlxreg-io.c +@@ -123,7 +123,7 @@ mlxreg_io_attr_store(struct device *dev, + return -EINVAL; + + /* Convert buffer to input value. */ +- ret = kstrtou32(buf, len, &input_val); ++ ret = kstrtou32(buf, 0, &input_val); + if (ret) + return ret; + diff --git a/queue-4.19/qed-fix-missing-error-code-in-qed_slowpath_start.patch b/queue-4.19/qed-fix-missing-error-code-in-qed_slowpath_start.patch new file mode 100644 index 00000000000..3f74451f1b7 --- /dev/null +++ b/queue-4.19/qed-fix-missing-error-code-in-qed_slowpath_start.patch @@ -0,0 +1,36 @@ +From a5a14ea7b4e55604acb0dc9d88fdb4cb6945bc77 Mon Sep 17 00:00:00 2001 +From: chongjiapeng +Date: Sat, 9 Oct 2021 16:09:26 +0800 +Subject: qed: Fix missing error code in qed_slowpath_start() + +From: chongjiapeng + +commit a5a14ea7b4e55604acb0dc9d88fdb4cb6945bc77 upstream. + +The error code is missing in this code scenario, add the error code +'-EINVAL' to the return value 'rc'. + +Eliminate the follow smatch warning: + +drivers/net/ethernet/qlogic/qed/qed_main.c:1298 qed_slowpath_start() +warn: missing error code 'rc'. + +Reported-by: Abaci Robot +Fixes: d51e4af5c209 ("qed: aRFS infrastructure support") +Signed-off-by: chongjiapeng +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/qlogic/qed/qed_main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ethernet/qlogic/qed/qed_main.c ++++ b/drivers/net/ethernet/qlogic/qed/qed_main.c +@@ -1067,6 +1067,7 @@ static int qed_slowpath_start(struct qed + } else { + DP_NOTICE(cdev, + "Failed to acquire PTT for aRFS\n"); ++ rc = -EINVAL; + goto err; + } + } diff --git a/queue-4.19/r8152-select-crc32-and-crypto-crypto_hash-crypto_sha256.patch b/queue-4.19/r8152-select-crc32-and-crypto-crypto_hash-crypto_sha256.patch new file mode 100644 index 00000000000..9c0f82c54e9 --- /dev/null +++ b/queue-4.19/r8152-select-crc32-and-crypto-crypto_hash-crypto_sha256.patch @@ -0,0 +1,41 @@ +From 9973a43012b6ad1720dbc4d5faf5302c28635b8c Mon Sep 17 00:00:00 2001 +From: Vegard Nossum +Date: Mon, 11 Oct 2021 17:22:49 +0200 +Subject: r8152: select CRC32 and CRYPTO/CRYPTO_HASH/CRYPTO_SHA256 + +From: Vegard Nossum + +commit 9973a43012b6ad1720dbc4d5faf5302c28635b8c upstream. + +Fix the following build/link errors by adding a dependency on +CRYPTO, CRYPTO_HASH, CRYPTO_SHA256 and CRC32: + + ld: drivers/net/usb/r8152.o: in function `rtl8152_fw_verify_checksum': + r8152.c:(.text+0x2b2a): undefined reference to `crypto_alloc_shash' + ld: r8152.c:(.text+0x2bed): undefined reference to `crypto_shash_digest' + ld: r8152.c:(.text+0x2c50): undefined reference to `crypto_destroy_tfm' + ld: drivers/net/usb/r8152.o: in function `_rtl8152_set_rx_mode': + r8152.c:(.text+0xdcb0): undefined reference to `crc32_le' + +Fixes: 9370f2d05a2a1 ("r8152: support request_firmware for RTL8153") +Fixes: ac718b69301c7 ("net/usb: new driver for RTL8152") +Signed-off-by: Vegard Nossum +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/Kconfig | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/usb/Kconfig ++++ b/drivers/net/usb/Kconfig +@@ -98,6 +98,10 @@ config USB_RTL8150 + config USB_RTL8152 + tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" + select MII ++ select CRC32 ++ select CRYPTO ++ select CRYPTO_HASH ++ select CRYPTO_SHA256 + help + This option adds support for Realtek RTL8152 based USB 2.0 + 10/100 Ethernet adapters and RTL8153 based USB 3.0 10/100/1000 diff --git a/queue-4.19/series b/queue-4.19/series index 603e293acce..37c4c6acb20 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -35,3 +35,16 @@ net-arc-select-crc32.patch net-korina-select-crc32.patch net-encx24j600-check-error-in-devm_regmap_init_encx24j600.patch ethernet-s2io-fix-setting-mac-address-during-resume.patch +nfc-fix-error-handling-of-nfc_proto_register.patch +nfc-digital-fix-possible-memory-leak-in-digital_tg_listen_mdaa.patch +nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch +pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch +platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch +drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch +drm-msm-mdp5-fix-cursor-related-warnings.patch +drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch +drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch +acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch +mqprio-correct-stats-in-mqprio_dump_class_stats.patch +qed-fix-missing-error-code-in-qed_slowpath_start.patch +r8152-select-crc32-and-crypto-crypto_hash-crypto_sha256.patch