Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp685382rdb; Tue, 16 Jan 2024 12:34:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEsoRZZV9zTbAtXsicuAB2UKV3sVnxHNHv1Ko2VVcBFf/VZDvRPcIHSntX6sTuPG8o0WL3s X-Received: by 2002:a17:902:ce81:b0:1d5:73d0:eb80 with SMTP id f1-20020a170902ce8100b001d573d0eb80mr4880018plg.64.1705437247642; Tue, 16 Jan 2024 12:34:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705437247; cv=pass; d=google.com; s=arc-20160816; b=hD2/nOvQ2RmTsyFEBECoXlDK7BayqSObGEeYv1iCGtfhzKfWjC4Ak/WC9E0nbUsSpb M4Nw69i1sivqaV4NvbPYHrHFUEa3kwJ9wG+KYkNcH7ecwJ+TDehg78FyxLVwCP23t+BH DZ8ESJ95K35xPVdm7bKBxXIfYIArCVOd8wEsknmZDrub844YYwq3smjrUfddPrZbqtsv sJ8/czOyX+GLxZirhUKtBuZXYfV2sdYt0nBKjzAO782nCd/5V8y8AGB8rL/Lj3ui+EgV w4+YuSKGEyzHp+yYm9hJlZNkbgJXL3hnQ3wcfyjsk2qwmBW9bylQXaMo+Ib6PYBKidD4 cpdw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=5oIEqH6jmNDKivHwOuU4ArB0OxAEoMQ0xKPtkX3oOZE=; fh=0eSPPyZ+rdHwwsb12Hn/i+N/VGOKhK1/Mj2An4VWtIk=; b=Tinyt2YYdDCSdLRnf6XIAqejN3rgzVI+LOTIb+F0qF2X6/K2hn4f1g/+1hZKowfouK k9R3Hseuz8KmR8CyfB3LvlvjEzNMeCakHN0oKYlMyPXi6uZLnacy4KOMKR4Syk5js32X xcoWblURCZzyBa+LgKrjXDd3WBWJldEN35teJbz3uszXT3tmJF0vBdkuPaNTT3nACfAz yPhdMa0/iV7gfxEG3bETH4PreTctWc8mCEdhVYPMV5GRpEVIz+joRGanlXy3/u/DKVyr gE8M8oc0KKbWWu4CY+Urt6KAkc2J5flsEjhZZV2I2QcXxcDN9tgTNceyWXIjGgCWb6he u5Ug== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uDGT6liZ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27930-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27930-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id i1-20020a17090332c100b001d5ad0f7351si9817278plr.260.2024.01.16.12.34.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 12:34:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27930-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uDGT6liZ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27930-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27930-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4EFA5287A51 for ; Tue, 16 Jan 2024 20:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A39F12AAD7; Tue, 16 Jan 2024 19:50:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uDGT6liZ" 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 3C51D241EF; Tue, 16 Jan 2024 19:50:03 +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=1705434603; cv=none; b=cTxAC6ARg8bmm6/xwv/vqxOlvXzzYw5Hw8Z0pOY82MZQJ/d/eN5U4MW2nmUxuu1cjB3P9CILbIqDkDREM25/gz3lVEDEFAENFVP1TKUENYhZf3rhtsxFNIPwddIupzjq4AHSsebCbvpOBfi9WI/mH4KoZksF7JDBoR9Hzi4UrRc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434603; c=relaxed/simple; bh=ChkW/m9ukbCox7xWcOwHlLqbHiYr7W6P0zsx2aBFoio=; 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=kelqxjtuBD2i+iWeXlhVOd48PA5ucE37OaTTZTD6Qujrb5VbJYr9y3B6mPBg9IQMzBP1kjBChlsh20CkIYGYqwSEsaChoPYxHtb1ckkwpH7/9KeaKJcp6MDx1MqVFkYQB2/Yr4o5qm/AGTZ0GseBGA3pKgJue7DBu6L6CZtpwtw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uDGT6liZ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDB95C43394; Tue, 16 Jan 2024 19:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434603; bh=ChkW/m9ukbCox7xWcOwHlLqbHiYr7W6P0zsx2aBFoio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uDGT6liZ+zrqVsO0ps4ZyHauMl6Gtatg2iY4l98iojG0QgGrx+31pX8wkB8/SD9bC tNGLaYy2JneNtuuyI5rliWjVs6bNYQJTWhTrwcV+kSK93mueL6PRpSigOVcZSOc5eE DO77xsuncp9uSxO2LcYFLKoAY2e9Pj9hAxrDDAWhWdFbLCBFuIqzjMEGVp1jyDUIyp mnRvgfHaWViG95M8M7eGD9Wm5zcv85sbdXSWMNK8j+zBaaMdhGwlz9VQm1ieIfNtop FqgpoEfm59q3haVyKbvyPa0rtClU6MpLPyEWWY9psB7fojxbpLXrYeCvwc7pTOglNi JSIVusVEO7odA== 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.6 022/104] bonding: return -ENOMEM instead of BUG in alb_upper_dev_walk Date: Tue, 16 Jan 2024 14:45:48 -0500 Message-ID: <20240116194908.253437-22-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194908.253437-1-sashal@kernel.org> References: <20240116194908.253437-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.6.12 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 dc2c7b979656..7edf0fd58c34 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 8e6cc0e133b7..9c1652886f4e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2973,8 +2973,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 = BOND_VLAN_PROTO_NONE; return tags; } -- 2.43.0