Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1862315lql; Wed, 13 Mar 2024 10:06:19 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUyjWg4NJuxHohuNLv9HXC7ooJwktv7iJFQnR0yM+l84B6lI0kw0meU7M0lyaLmj5f380BA0mYi9yZLaOdaulHZgxtHyFcEgqWN7QmqgA== X-Google-Smtp-Source: AGHT+IFwFtKIQHNtEO+Dc6KGWY3OK4jJAb4+mllZkxLnIH3aPEyObGUC8FpxE9gNO+MjMMAp2SZT X-Received: by 2002:a17:902:f683:b0:1dd:918d:33ae with SMTP id l3-20020a170902f68300b001dd918d33aemr12956263plg.60.1710349579420; Wed, 13 Mar 2024 10:06:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710349579; cv=pass; d=google.com; s=arc-20160816; b=qfV96OzooiXlvuAd10orEvOnoRn+3zaddHGMDXHPQjdH2UUxhGMC65VjqcCOmYJyw9 X5yImcEnP7ZUuIN1onYFjtX0Hmei53HVa4h84GhoOmlaYHyS5Y3/xdm1QOtMEx3WW0WU rn37IAGDeUEKCsPKmJiksZwQwJXui06iZDqrvYo9qN1ccmzj/iqRrLlOrULcFDfrOoTf DpRvnBJViCWp+1LKhuauW/dsDCx98EtSd+nrtYYCmnJtogyHiA7moNBuNgsRK+nV0+10 34k708+rc58iHc5x6z1j/WGGB1RtctEJGPEeiwBVaG0je1uUu4woHwsIdgDAoPTZJ56H zSvw== 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=cEdZjY9Xa2RUHC/+5b0EfuXe9iDhrVFaDj48YkL5DR0=; fh=b7FykSoXLOnj6aKUKR1n5Zr5fbYmOPFLxyzJwBcIv/M=; b=dxndprQH99yO4/sJdJ/viUiYHLDB4d4zHZzoz9yOTrnkiFV8HiCjDLpqqbok1U26UH J9UA5o0xJmAeM4/N9WB5n4D4dr60q+nqeLRZ9b9KwSK5RXUhMbMG7cqFO6fOCZhmqpxU mSwyCb4iPop9iU90IAobVlSy4xacMMxyec0wWNgFt4AjRaixYrN8PwFiualB/sWbPstn 2mfJTwm1Xb45xNETuYsmKx0bO5Qjtwiz8DtCLEf2pN2wE8v+xS+awuLEmgAeKek4QARu 3TDz+LJ5HRqoDcfXh0NB4Qa8ym5kvj40uFFDE6VY3tA5XVqpsUax/KFvuxGVKZwMt2eT DjdQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JpQkgpt9; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101829-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101829-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 z7-20020a170903018700b001dcb8376f66si9628409plg.265.2024.03.13.10.06.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 10:06:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-101829-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=JpQkgpt9; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101829-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101829-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 CFBAF2847C7 for ; Wed, 13 Mar 2024 16:53:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EF3B76D1A3; Wed, 13 Mar 2024 16:37:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JpQkgpt9" 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 1CE1A6CDCA; Wed, 13 Mar 2024 16:37:43 +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=1710347863; cv=none; b=rN/6cVAmpL7YteqkHwzObTdf+rhZv6tneQ3ZOBh1r9oO7TuBtmLYpuWDJKJLtCnLj+tlI4zQxj/y+kzEBFAuD82b570tDMElDkEAvzXotxvnL1OFOETIxQgTBwrYFL5g8IHZGhVQTWBfqTPym+69nyFjjpRBWwo7q/v4ppzGCmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347863; c=relaxed/simple; bh=8o1ZOebRTS6KxGyRL3P369CkvJplrXXspwfA5lVfTA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VjWaecuRArerUNXhOULCUkoRQNQo9s3G3AtX/kDweKqXkz6R9oGb3d8s3QHh5S2GlXoq0vwLZTQ0TOYCNVYVymoyS31Xx7SBR+EABUNK70zKPhRjg8jiIWkaLNJWIkWr6HKmJxYbWyX4sI6aSidb48iv8zX74zJcbJMsbgzdNWU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JpQkgpt9; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28795C433C7; Wed, 13 Mar 2024 16:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710347863; bh=8o1ZOebRTS6KxGyRL3P369CkvJplrXXspwfA5lVfTA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JpQkgpt98wK6n7p/KLoJ7Aap1hqkcPgr0fnyuMBbntt2cqxWVUGtpYwRGOW8gK9or 9crjrAQg4ioelGm7PMQ55gJLL2GsRaJxPZZyP8mLf8PeVFHITNREnaB9ojifPMuRX0 o4dYl9JaN7KtgD5jEHeP21DbpFncbB6h3de7erIvKNsYgDUKw8Zw20DCzV+aQfPRTr vSqb6VRzDii8cgXVAUkQ0uZLijaINC/GUbtbs+PEcG6PXWOFyHFkrIaxqpT4/rng+x 44gl5fp3k94a15rfRCK1RmXIt/k7LdRSODhu6u1hsIw0eLCARo7cZoRxu/glZ+SB1V 225fntV7mizug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rand Deeb , Simon Horman , Tony Nguyen , Sasha Levin Subject: [PATCH 6.6 26/60] net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() Date: Wed, 13 Mar 2024 12:36:33 -0400 Message-ID: <20240313163707.615000-27-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313163707.615000-1-sashal@kernel.org> References: <20240313163707.615000-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-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.22-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.6.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.6.22-rc1 X-KernelTest-Deadline: 2024-03-15T16:36+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Rand Deeb [ Upstream commit 06e456a05d669ca30b224b8ed962421770c1496c ] The function ice_bridge_setlink() may encounter a NULL pointer dereference if nlmsg_find_attr() returns NULL and br_spec is dereferenced subsequently in nla_for_each_nested(). To address this issue, add a check to ensure that br_spec is not NULL before proceeding with the nested attribute iteration. Fixes: b1edc14a3fbf ("ice: Implement ice_bridge_getlink and ice_bridge_setlink") Signed-off-by: Rand Deeb Reviewed-by: Simon Horman Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index d8d2aa4c0216a..d23f2ebddeb45 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -7786,6 +7786,8 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, pf_sw = pf->first_sw; /* find the attribute in the netlink message */ br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); + if (!br_spec) + return -EINVAL; nla_for_each_nested(attr, br_spec, rem) { __u16 mode; -- 2.43.0