Fix below warning caused by smatch by using array_index_nospec()
to clamp the index within the range.
"warn: potential spectre issue 'plat_dev.sock' [r] (local cap)"
Signed-off-by: Suma Hegde <suma.hegde@xxxxxxx>
Reviewed-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@xxxxxxx>
---
Changes since v2:
None
Changes since v1:
Change plat_dev to hsmp_pdev
drivers/platform/x86/amd/hsmp/acpi.c | 3 +++
drivers/platform/x86/amd/hsmp/plat.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c
index 4b1470ca8675..cc859c9fe2dd 100644
--- a/drivers/platform/x86/amd/hsmp/acpi.c
+++ b/drivers/platform/x86/amd/hsmp/acpi.c
@@ -19,6 +19,7 @@
#include <linux/dev_printk.h>
#include <linux/ioport.h>
#include <linux/kstrtox.h>
+#include <linux/nospec.h>
#include <linux/platform_device.h>
#include <linux/uuid.h>
@@ -275,6 +276,8 @@ static int init_acpi(struct device *dev)
if (sock_ind >= hsmp_pdev.num_sockets)
return -EINVAL;
+ sock_ind = array_index_nospec(sock_ind, hsmp_pdev.num_sockets);
+
ret = hsmp_parse_acpi_table(dev, sock_ind);
if (ret) {
dev_err(dev, "Failed to parse ACPI table\n");
diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c
index 33868346b5a0..00dc7a0d358d 100644
--- a/drivers/platform/x86/amd/hsmp/plat.c
+++ b/drivers/platform/x86/amd/hsmp/plat.c
@@ -17,6 +17,7 @@
#include <linux/device.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/nospec.h>
#include <linux/platform_device.h>
#define DRIVER_NAME "amd_hsmp"
@@ -77,6 +78,8 @@ static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj,
if (sock_ind >= hsmp_pdev.num_sockets)
return -EINVAL;
+ sock_ind = array_index_nospec(sock_ind, hsmp_pdev.num_sockets);
+
sock = &hsmp_pdev.sock[sock_ind];
if (!sock)
return -EINVAL;
--
2.25.1
