This is a note to let you know that I've just added the patch titled
vdpa: Add queue index attr to vdpa_nl_policy for nlattr length check
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vdpa-add-queue-index-attr-to-vdpa_nl_policy-for-nlattr-length-check.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b3003e1b54e057f5f3124e437b80c3bef26ed3fe Mon Sep 17 00:00:00 2001
From: Lin Ma <linma@xxxxxxxxxx>
Date: Thu, 27 Jul 2023 20:57:50 +0300
Subject: vdpa: Add queue index attr to vdpa_nl_policy for nlattr length check
From: Lin Ma <linma@xxxxxxxxxx>
commit b3003e1b54e057f5f3124e437b80c3bef26ed3fe upstream.
The vdpa_nl_policy structure is used to validate the nlattr when parsing
the incoming nlmsg. It will ensure the attribute being described produces
a valid nlattr pointer in info->attrs before entering into each handler
in vdpa_nl_ops.
That is to say, the missing part in vdpa_nl_policy may lead to illegal
nlattr after parsing, which could lead to OOB read just like CVE-2023-3773.
This patch adds the missing nla_policy for vdpa queue index attr to avoid
such bugs.
Fixes: 13b00b135665 ("vdpa: Add support for querying vendor statistics")
Signed-off-by: Lin Ma <linma@xxxxxxxxxx>
Cc: stable@vger.kernelorg
Message-Id: <20230727175757.73988-5-dtatulea@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/vdpa/vdpa.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -1174,6 +1174,7 @@ static const struct nla_policy vdpa_nl_p
[VDPA_ATTR_DEV_NET_CFG_MACADDR] = NLA_POLICY_ETH_ADDR,
/* virtio spec 1.1 section 5.1.4.1 for valid MTU range */
[VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68),
+ [VDPA_ATTR_DEV_QUEUE_INDEX] = { .type = NLA_U32 },
[VDPA_ATTR_DEV_FEATURES] = { .type = NLA_U64 },
};
Patches currently in stable-queue which might be from linma@xxxxxxxxxx are
queue-6.1/vdpa-add-queue-index-attr-to-vdpa_nl_policy-for-nlattr-length-check.patch
queue-6.1/vdpa-add-features-attr-to-vdpa_nl_policy-for-nlattr-length-check.patch
queue-6.1/vdpa-add-max-vqp-attr-to-vdpa_nl_policy-for-nlattr-length-check.patch
