Skip to content

Commit 2aadc15

Browse files
committed
Merge: CVE-2024-44931: gpio: prevent potential speculation leaks in gpio_device_get_desc()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5102 JIRA: https://issues.redhat.com/browse/RHEL-56213 CVE: CVE-2024-44931 ``` gpio: prevent potential speculation leaks in gpio_device_get_desc() Userspace may trigger a speculative read of an address outside the gpio descriptor array. Users can do that by calling gpio_ioctl() with an offset out of range. Offset is copied from user and then used as an array index to get the gpio descriptor without sanitization in gpio_device_get_desc(). This change ensures that the offset is sanitized by using array_index_nospec() to mitigate any possibility of speculative information leaks. This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc. Signed-off-by: Hagar Hemdan <hagarhem@amazon.com> Link: https://lore.kernel.org/r/20240523085332.1801-1-hagarhem@amazon.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> (cherry picked from commit d795848) ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Brian Masney <bmasney@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 713a5b1 + ed204fd commit 2aadc15

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpio/gpiolib.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/kernel.h>
1616
#include <linux/list.h>
1717
#include <linux/module.h>
18+
#include <linux/nospec.h>
1819
#include <linux/of.h>
1920
#include <linux/pinctrl/consumer.h>
2021
#include <linux/seq_file.h>
@@ -164,7 +165,7 @@ struct gpio_desc *gpiochip_get_desc(struct gpio_chip *gc,
164165
if (hwnum >= gdev->ngpio)
165166
return ERR_PTR(-EINVAL);
166167

167-
return &gdev->descs[hwnum];
168+
return &gdev->descs[array_index_nospec(hwnum, gdev->ngpio)];
168169
}
169170
EXPORT_SYMBOL_GPL(gpiochip_get_desc);
170171

0 commit comments

Comments
 (0)