Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1904877lql; Wed, 13 Mar 2024 11:22:14 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVdPu3gP5Gy+ewU5l91EbhbSMl9mvVs9OrVUz7ySJ8axqG6bFFYHhnvnlvRKdmDB7XRRuPrBV+23s+qG/qKVEHnQH3bifuhjz3g4EztBw== X-Google-Smtp-Source: AGHT+IHNctHTwKP052d6fygy3BTtPsyTX4ESYINHLk5LUSmW1Bai01sYuBIFjSAk8Yv4uUhH9NzA X-Received: by 2002:a05:6a00:cd2:b0:6e6:b4f3:19ec with SMTP id b18-20020a056a000cd200b006e6b4f319ecmr4416260pfv.7.1710354134177; Wed, 13 Mar 2024 11:22:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710354134; cv=pass; d=google.com; s=arc-20160816; b=zxNqBX2C4yDE2kk1Yfy8GH8ndX/xGiEbT7Tzu7eoMG7frrNk1Eq5MOTQI9qp5FamyI FLhAB3kZt+7bsqy2r0OA4goDO/bGLriYdN5H5Cc7Z5G9j/XHUlJHoEcSc0qNxlJlXaUl gsgZrpLNpCkfNi2mXVS6+hB1CepDG2MMnE57tUgcsUXXlIK3xpFdR0DLv1z+ZuGJeBi5 LFeROnQr9WB9/7uTK2YcodV0GV3YXORC5wZURAjvBFugTmHXvQ8lobAl/yyoMZdrKAcL VwQc/FsmPXcjPO57yliVmZbhEOluiWHo2i/+D8qBYFCLydBpTqFHazwb0x8+lssCDiAZ 4Lzw== 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=nm4UrpUYed7sqBk7pGgD1+pYWQx6omyBKCgVSaK/kHs=; fh=b7FykSoXLOnj6aKUKR1n5Zr5fbYmOPFLxyzJwBcIv/M=; b=ROnkwCNFKaDdEblwGpEQDMRaAGhL217gmxmNVeuGI09xF/5xVVlxMMNEyG/dpMf+7W Hnm1KH8ZNI/j8iXZjDGE8jrmYjT6fg0/q58FBslwQmW/Hlusr2fnGatDN82Hi7uQsoLU c1E8qVdEHwRnfFxfchAgKqhrTPOhkSr7RHL2RzvpUPH6OGhZn3rLUWwaJWkjAqcLUX6t ShtyMPLU3B/r/hdvCZ/4Wj8edVsUEsqqA97mImy2NjNCuIN5av8NkkeX34qsYlgKCFsf KJ1tJRLyRdTV9WB0XCCvnaX1oXzK7OuM0i6PZMpxzD3cIYrX/URm6+cFNK3Dpx06diZg upNw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UG4Drw5V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102128-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102128-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id m22-20020a056a00081600b006e56d29f455si9966565pfk.268.2024.03.13.11.22.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 11:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-102128-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UG4Drw5V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102128-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102128-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id DCC6DB21BBB for ; Wed, 13 Mar 2024 18:04:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8758B6E5E4; Wed, 13 Mar 2024 17:02:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UG4Drw5V" 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 A0FAF6D1C6; Wed, 13 Mar 2024 17:02:24 +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=1710349344; cv=none; b=mMJ5MTK3/uKk6dAHuaKtBRIwrkFr2Yx+dFLKti9y1+domElTWTg+aA7fGofnT57Al7uha2Lk6TaqhqgigMFdlFKW0zhtAcoTS0FP49S9+lcOvdQji93h7BzGqCgO5+smN2QTf+FS2DYuZf1obZsImx9n7bG8hGXFFHXhvyacKAc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349344; c=relaxed/simple; bh=pAviTd0UtyjF9JP5n1tHJ0A7tM2Ujl89aL2cNqhWO7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HdtPiSU9PIzEvvTlYG3wUmwGedPJz/KOu64k659hBLFvNuUgffjMyMIaEItc6f2MafhaLrMWsELs4pMWI9Bs09N3wxOXoEikF+1NOZKbNtil9XizvoZVJKhs1wfBsgWVeFjO0gp/7aIjtZjkpuwK8cYqS/RoJIveF70R3PSmHyw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UG4Drw5V; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 710CEC433C7; Wed, 13 Mar 2024 17:02:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710349344; bh=pAviTd0UtyjF9JP5n1tHJ0A7tM2Ujl89aL2cNqhWO7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UG4Drw5VICw7VWCK7gzHQ0p07LZwe6LkzTGYxhonNLGDHO7Jfg93pieMmggvCa5HD uVGoGOY4/5k6WeoAMRKe+XQ0xH5FdGf1hrgqEKuGpBsvEUXa1ydqrpeOC4/9koIgaK ZCHZ8uPLVKTSO3Vr6uWjojDl+Xf52AXcPmVLuGemb0ftQaHrskNM2K3fNPVtXRUogR 7WZwFq6J7IxHKNPr25IRLdmYvuVsnK2YKJWOXHbzHBpWn7Eogtj18cs74zH2/zqIq+ kaWKFWxENLXQwL0aqHiGoO/VFazrKJRFGormSdJ/4D6um33ep/e7D1PSuUUyS9ACNa VAzU+biR4GrNw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rand Deeb , Simon Horman , Tony Nguyen , Sasha Levin Subject: [PATCH 5.4 08/51] net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() Date: Wed, 13 Mar 2024 13:01:29 -0400 Message-ID: <20240313170212.616443-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313170212.616443-1-sashal@kernel.org> References: <20240313170212.616443-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/v5.x/stable-review/patch-5.4.272-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.272-rc1 X-KernelTest-Deadline: 2024-03-15T17:02+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 209ae96875849..cf1baae963de2 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4594,6 +4594,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