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 6DB9F54BFE; Tue, 14 May 2024 11:16:51 +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=1715685411; cv=none; b=Bc5VTEXV8Ff63ztz1xGFc8MXikWwVAFtits2HV8K80XqFnCaHBvGLTult8aY9gYU/Y8bxa//6DUnYGoUvfych4qPAf93SW9YLThRgK0RJYQSBksw1o4THXCe2IosjVKD3HaLV4HaeMpNzzh2ZgbPzQ1pHE1eKc0OM5rjyQvQVig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685411; c=relaxed/simple; bh=m0iF1k2XTcsxIxWcvMp3VpxFgZvWvIuvQN1kbxua0kg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G7i8QxdejD+NreTgwcMJvkh+0czqFHPJ1t70jcb9nRhswAKUICJ7X7sAz6CN+04LIWB7ZYejji4KHlf3mcjMEQ/iEk/lXC2151F4+4QA47QKuW6tzUtZ9yxPqZpgUzGbK4B+Lk+4vmNOfuG9/2jMe8e02CQ1TzIYmLAjdHP0Zo8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UHeKQSoI; 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="UHeKQSoI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB21BC2BD10; Tue, 14 May 2024 11:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715685411; bh=m0iF1k2XTcsxIxWcvMp3VpxFgZvWvIuvQN1kbxua0kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHeKQSoIQ3khPLeGwuBproSsQd4g8P+RXfiCCwS6bDwAjtUWQGqnjUMWEc1ZE3u2S GzwlxL67fIzOlT260z/0GLr1DdM+wJ/WYvVGcSxWYQrsxxyba6JiVeWx5aSelmAo/C 9rMubr6+FdKBki2Ka0HTckjBbuUladHt5aXV7Z8o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Roded Zats , Donald Hunter , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 184/301] rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation Date: Tue, 14 May 2024 12:17:35 +0200 Message-ID: <20240514101039.203597495@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Roded Zats [ Upstream commit 1aec77b2bb2ed1db0f5efc61c4c1ca3813307489 ] Each attribute inside a nested IFLA_VF_VLAN_LIST is assumed to be a struct ifla_vf_vlan_info so the size of such attribute needs to be at least of sizeof(struct ifla_vf_vlan_info) which is 14 bytes. The current size validation in do_setvfinfo is against NLA_HDRLEN (4 bytes) which is less than sizeof(struct ifla_vf_vlan_info) so this validation is not enough and a too small attribute might be cast to a struct ifla_vf_vlan_info, this might result in an out of bands read access when accessing the saved (casted) entry in ivvl. Fixes: 79aab093a0b5 ("net: Update API for VF vlan protocol 802.1ad support") Signed-off-by: Roded Zats Reviewed-by: Donald Hunter Link: https://lore.kernel.org/r/20240502155751.75705-1-rzats@paloaltonetworks.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index e8bf481e80f72..89964270cf27f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2519,7 +2519,7 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb) nla_for_each_nested(attr, tb[IFLA_VF_VLAN_LIST], rem) { if (nla_type(attr) != IFLA_VF_VLAN_INFO || - nla_len(attr) < NLA_HDRLEN) { + nla_len(attr) < sizeof(struct ifla_vf_vlan_info)) { return -EINVAL; } if (len >= MAX_VLAN_LIST_LEN) -- 2.43.0