]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86/amd/hsmp: Ensure sock->metric_tbl_addr is non-NULL
authorSuma Hegde <suma.hegde@amd.com>
Thu, 7 Aug 2025 10:06:37 +0000 (10:06 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:34:43 +0000 (16:34 +0200)
[ Upstream commit 2c78fb287e1f430b929f2e49786518350d15605c ]

If metric table address is not allocated, accessing metrics_bin will
result in a NULL pointer dereference, so add a check.

Fixes: 5150542b8ec5 ("platform/x86/amd/hsmp: add support for metrics tbl")
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Link: https://lore.kernel.org/r/20250807100637.952729-1-suma.hegde@amd.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/amd/hsmp/hsmp.c

index 885e2f8136fd443d1ef9c89520c1862884b11748..19f82c1d30905921c3f1b76e8e0fce45f8890c1c 100644 (file)
@@ -356,6 +356,11 @@ ssize_t hsmp_metric_tbl_read(struct hsmp_socket *sock, char *buf, size_t size)
        if (!sock || !buf)
                return -EINVAL;
 
+       if (!sock->metric_tbl_addr) {
+               dev_err(sock->dev, "Metrics table address not available\n");
+               return -ENOMEM;
+       }
+
        /* Do not support lseek(), also don't allow more than the size of metric table */
        if (size != sizeof(struct hsmp_metric_table)) {
                dev_err(sock->dev, "Wrong buffer size\n");