From acd12854db9b0664ca8705f04a5befc321d558cb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 2 Feb 2024 19:46:30 -0800 Subject: [PATCH] 5.15-stable patches added patches: bonding-remove-print-in-bond_verify_device_path.patch --- ...ove-print-in-bond_verify_device_path.patch | 39 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.15/bonding-remove-print-in-bond_verify_device_path.patch diff --git a/queue-5.15/bonding-remove-print-in-bond_verify_device_path.patch b/queue-5.15/bonding-remove-print-in-bond_verify_device_path.patch new file mode 100644 index 00000000000..ea90400dd41 --- /dev/null +++ b/queue-5.15/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 +@@ -2893,11 +2893,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-5.15/series b/queue-5.15/series index 4004d1398d5..0221cf091ad 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -297,3 +297,4 @@ arm64-dts-qcom-sm8150-fix-usb-dp-dm-hs-phy-interrupts.patch gve-fix-use-after-free-vulnerability.patch hid-apple-add-support-for-the-2021-magic-keyboard.patch hid-apple-add-2021-magic-keyboard-fn-key-mapping.patch +bonding-remove-print-in-bond_verify_device_path.patch -- 2.47.3