From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 3 Feb 2024 03:46:08 +0000 (-0800)
Subject: 5.10-stable patches
X-Git-Tag: v6.1.77~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b041356fc806754cbade86841547fbe44502a0c4;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	bonding-remove-print-in-bond_verify_device_path.patch
---

diff --git a/queue-5.10/bonding-remove-print-in-bond_verify_device_path.patch b/queue-5.10/bonding-remove-print-in-bond_verify_device_path.patch
new file mode 100644
index 00000000000..07da3fa9269
--- /dev/null
+++ b/queue-5.10/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 <shaozhengchao@huawei.com>
+Date: Thu, 23 Nov 2023 09:55:15 +0800
+Subject: bonding: remove print in bond_verify_device_path
+
+From: Zhengchao Shao <shaozhengchao@huawei.com>
+
+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 <pabeni@redhat.com>
+Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
+Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -2777,11 +2777,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.10/series b/queue-5.10/series
index e7e5ffcfb7d..b697c07a4cc 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -242,3 +242,4 @@ af_unix-fix-lockdep-positive-in-sk_diag_dump_icons.patch
 net-sysfs-fix-sys-class-net-iface-path.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