From 086e85fdc83356776a2397fae4bc7f1dbbbe5cf2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 2 Feb 2024 19:46:52 -0800 Subject: [PATCH] 6.1-stable patches added patches: bonding-remove-print-in-bond_verify_device_path.patch --- ...ove-print-in-bond_verify_device_path.patch | 39 +++++++++++++++++++ queue-6.1/series | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch diff --git a/queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch b/queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch new file mode 100644 index 00000000000..021e7a42936 --- /dev/null +++ b/queue-6.1/bonding-remove-print-in-bond_verify_device_path.patch @@ -0,0 +1,39 @@ +From 486058f42a4728053ae69ebbf78e9731d8ce6f8b Mon Sep 17 00:00:00 2001 +From: Zhengchao Shao +Date: Thu, 23 Nov 2023 09:55:15 +0800 +Subject: bonding: remove print in bond_verify_device_path + +From: Zhengchao Shao + +commit 486058f42a4728053ae69ebbf78e9731d8ce6f8b upstream. + +As suggested by Paolo in link[1], if the memory allocation fails, the mm +layer will emit a lot warning comprising the backtrace, so remove the +print. + +[1] https://lore.kernel.org/all/20231118081653.1481260-1-shaozhengchao@huawei.com/ + +Suggested-by: Paolo Abeni +Signed-off-by: Zhengchao Shao +Reviewed-by: Hangbin Liu +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/bonding/bond_main.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -2943,11 +2943,8 @@ struct bond_vlan_tag *bond_verify_device + + if (start_dev == end_dev) { + tags = kcalloc(level + 1, sizeof(*tags), GFP_ATOMIC); +- if (!tags) { +- net_err_ratelimited("%s: %s: Failed to allocate tags\n", +- __func__, start_dev->name); ++ if (!tags) + return ERR_PTR(-ENOMEM); +- } + tags[level].vlan_proto = VLAN_N_VID; + return tags; + } diff --git a/queue-6.1/series b/queue-6.1/series index 6f24d3faaa8..ce918e4ae00 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -109,7 +109,6 @@ rdma-ipoib-fix-error-code-return-in-ipoib_mcast_join.patch drm-panel-edp-add-override_edid_mode-quirk-for-gener.patch drm-bridge-anx7625-fix-set-hpd-irq-detect-window-to-.patch drm-amd-display-fix-tiled-display-misalignment.patch -media-renesas-vsp1-fix-references-to-pad-config.patch f2fs-fix-write-pointers-on-zoned-device-after-roll-f.patch asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch drm-drm_file-fix-use-of-uninitialized-variable.patch @@ -217,3 +216,4 @@ revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch drm-msm-dsi-enable-runtime-pm.patch loongarch-smp-call-rcutree_report_cpu_starting-at-tlb_init.patch gve-fix-use-after-free-vulnerability.patch +bonding-remove-print-in-bond_verify_device_path.patch -- 2.47.3