Unverified Commit 1157fe8f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11299 gpio: prevent potential speculation leaks in gpio_device_get_desc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J3EDLCGD57YG3QG2EPRIX3W5PI45RSIB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMMC8 
 
Link:https://gitee.com/openeuler/kernel/pulls/11299

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents a331adfb f3f01998

drivers/gpio/gpiolib.c

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/bitmap.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/nospec.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/spinlock.h>
@@ -143,7 +144,7 @@ struct gpio_desc *gpiochip_get_desc(struct gpio_chip *gc, 
	if (hwnum >= gdev->ngpio)

		return ERR_PTR(-EINVAL);



	return &gdev->descs[hwnum];

	return &gdev->descs[array_index_nospec(hwnum, gdev->ngpio)];

}

EXPORT_SYMBOL_GPL(gpiochip_get_desc);