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 30F252C190; Sun, 1 Sep 2024 17:06:14 +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=1725210375; cv=none; b=VwujJGZ/o5kDl3wNuGQzWi8PXRPjQ2lLTs+RvbWgMlrkreyy9dPBWtnHFaqo8wtYG+qmdqn9SNfgH3mlxoRpalsoihNVPJoX2iXWbMDJP5THWwnuNBYDkVzScztCBBU/o1BPdPu1KsbtuMs13JfpC4vuI7l3/LiKo9+JQ0+1TDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725210375; c=relaxed/simple; bh=hrLzIOSnHXPVnTenjBSF6vNdSKyMhTuCocgejXQITb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OTxqiz5sn4HlH/iyrUPuZuLs4e6LLMWsw5gVenhvvwbl2c99lJhUTWseHXqjKPlNbHN06rFxgebx8q1IYIRQ7lR6O/BZ35NUNwp1KspnDFb2HbNbTqszzDiuRmGNrFMZIlGQnbB07c2DipR+RHYmQIahMfF1CWiI6tztnrURMAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HecaWNHA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HecaWNHA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE46C4CEC3; Sun, 1 Sep 2024 17:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725210374; bh=hrLzIOSnHXPVnTenjBSF6vNdSKyMhTuCocgejXQITb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HecaWNHAWne5kLdBm4KGUOT31QNnIK1DYSnXaD8bYYS5G5fUCr4XbwSFlM1zgg/fN ujmjzEUhlZtvw9DUD4g1aSeKI8uO9WtuAl+aJ2cqu96B1SGBhk3vbt4aLQw6ROshyH 3cFvptdTM/rsrwblzNnwnRqB0fi5yD/EQ09/fqmw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikolay Aleksandrov , Hangbin Liu , Paolo Abeni , Sasha Levin Subject: [PATCH 5.15 139/215] bonding: fix bond_ipsec_offload_ok return type Date: Sun, 1 Sep 2024 18:17:31 +0200 Message-ID: <20240901160828.621480875@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160823.230213148@linuxfoundation.org> References: <20240901160823.230213148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nikolay Aleksandrov [ Upstream commit fc59b9a5f7201b9f7272944596113a82cc7773d5 ] Fix the return type which should be bool. Fixes: 955b785ec6b3 ("bonding: fix suspicious RCU usage in bond_ipsec_offload_ok()") Signed-off-by: Nikolay Aleksandrov Reviewed-by: Hangbin Liu Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/bonding/bond_main.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6a91229b0e05b..61ff4bb22e647 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -592,34 +592,28 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs) struct net_device *real_dev; struct slave *curr_active; struct bonding *bond; - int err; + bool ok = false; bond = netdev_priv(bond_dev); rcu_read_lock(); curr_active = rcu_dereference(bond->curr_active_slave); real_dev = curr_active->dev; - if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) { - err = false; + if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) goto out; - } - if (!xs->xso.real_dev) { - err = false; + if (!xs->xso.real_dev) goto out; - } if (!real_dev->xfrmdev_ops || !real_dev->xfrmdev_ops->xdo_dev_offload_ok || - netif_is_bond_master(real_dev)) { - err = false; + netif_is_bond_master(real_dev)) goto out; - } - err = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs); + ok = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs); out: rcu_read_unlock(); - return err; + return ok; } static const struct xfrmdev_ops bond_xfrmdev_ops = { -- 2.43.0