From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64CA7140799; Tue, 16 Jan 2024 19:55:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434933; cv=none; b=DJ+VZe+8lydxhaY0dmfjGF9rZ8AGOyeElqQF7wTbEPf8JIeNvpQW5OqvvcbwA2USeE8sNMRoYdrq4N57cmg1CnKSNylrKnS/bFrDzQiQttHHIHVAxV9s2YHqC2fQinEx02QoLgwa1vJ58Q75yf8HNdvSMeb/52O+/AfHxC1C34Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434933; c=relaxed/simple; bh=MXe97cN5p1ZhcU9p8UHkbJpF7qTGqAqQ3+zai7wP0Yw=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=NpL5O5Pc5nS0TnApD2RKW6TdO68ewX9DKeAQMpU0AihjV548UEtEQ+Dvzf16uQObOyTo0sb0egXX84fqx2CgWe74TUiPTvEUEJXzYzA/86FnUJn17C7GWw14fzMMIC4uw+uWEwU/JaFVE0VIowyeOJGm5iZ3YMHBniHlDGafFAk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iLnNVNDK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iLnNVNDK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1DB2C43394; Tue, 16 Jan 2024 19:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434933; bh=MXe97cN5p1ZhcU9p8UHkbJpF7qTGqAqQ3+zai7wP0Yw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iLnNVNDK+4PXIHl+23j0NKH/kSsPU2nw0cu/255WP2NJ0PNpuEdNSHiL6SiIdapvU hgD8JCoWE8Ejx3XHH8ns0SdTKckx3E39P6UkMqKTcqBzC4H2MYdDHgfVX3lPme+YC7 PXRqfTlsuPH7M6/wupN9hc0BKKFqxJW0SrDwxHvsFLbim9v+w1l4STR8LrbDMV0w/N rSYTfdcL2v4KbWI0eqhTa5LOVedLs3x2u4BFk2ttYjamcEkfcz4B6TGIbvMnUPCRND oGKgpG+dnO4QvFgwMirH1CkA001Xxk8ccYKzrEYuayb1HPN1NOORWZN2HSAjfyJjkP H6MJHkkKphB8g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhengchao Shao , Jay Vosburgh , Paolo Abeni , Sasha Levin , j.vosburgh@gmail.com, andy@greyhouse.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 10/68] bonding: return -ENOMEM instead of BUG in alb_upper_dev_walk Date: Tue, 16 Jan 2024 14:53:09 -0500 Message-ID: <20240116195511.255854-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116195511.255854-1-sashal@kernel.org> References: <20240116195511.255854-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.73 Content-Transfer-Encoding: 8bit From: Zhengchao Shao [ Upstream commit d6b83f1e3707c4d60acfa58afd3515e17e5d5384 ] If failed to allocate "tags" or could not find the final upper device from start_dev's upper list in bond_verify_device_path(), only the loopback detection of the current upper device should be affected, and the system is no need to be panic. So return -ENOMEM in alb_upper_dev_walk to stop walking, print some warn information when failed to allocate memory for vlan tags in bond_verify_device_path. I also think that the following function calls netdev_walk_all_upper_dev_rcu ---->>>alb_upper_dev_walk ---------->>>bond_verify_device_path >From this way, "end device" can eventually be obtained from "start device" in bond_verify_device_path, IS_ERR(tags) could be instead of IS_ERR_OR_NULL(tags) in alb_upper_dev_walk. Signed-off-by: Zhengchao Shao Acked-by: Jay Vosburgh Link: https://lore.kernel.org/r/20231118081653.1481260-1-shaozhengchao@huawei.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/bonding/bond_alb.c | 3 ++- drivers/net/bonding/bond_main.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index fc5da5d7744d..9c4c2c7d90ef 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -985,7 +985,8 @@ static int alb_upper_dev_walk(struct net_device *upper, if (netif_is_macvlan(upper) && !strict_match) { tags = bond_verify_device_path(bond->dev, upper, 0); if (IS_ERR_OR_NULL(tags)) - BUG(); + return -ENOMEM; + alb_send_lp_vid(slave, upper->dev_addr, tags[0].vlan_proto, tags[0].vlan_id); kfree(tags); diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 710734a5af9b..2b333a62ba81 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2943,8 +2943,11 @@ struct bond_vlan_tag *bond_verify_device_path(struct net_device *start_dev, if (start_dev == end_dev) { tags = kcalloc(level + 1, sizeof(*tags), GFP_ATOMIC); - if (!tags) + if (!tags) { + net_err_ratelimited("%s: %s: Failed to allocate tags\n", + __func__, start_dev->name); return ERR_PTR(-ENOMEM); + } tags[level].vlan_proto = VLAN_N_VID; return tags; } -- 2.43.0