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

!13036 iio: health: afe4403: Fix oob read in afe4403_read_raw 

Merge Pull Request from: @ci-robot 
 
PR sync from: Qi Xi <xiqi2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UPFA5ONDWOSO6XKFWW3ADNPYYSLNROR6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRDV 
 
Link:https://gitee.com/openeuler/kernel/pulls/13036

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3433623d 60e7aa82

drivers/iio/health/afe4403.c

+3 −2
Original line number Diff line number Diff line
@@ -245,14 +245,14 @@ static int afe4403_read_raw(struct iio_dev *indio_dev, 
			    int *val, int *val2, long mask)

{

	struct afe4403_data *afe = iio_priv(indio_dev);

	unsigned int reg = afe4403_channel_values[chan->address];

	unsigned int field = afe4403_channel_leds[chan->address];

	unsigned int reg, field;

	int ret;



	switch (chan->type) {

	case IIO_INTENSITY:

		switch (mask) {

		case IIO_CHAN_INFO_RAW:

			reg = afe4403_channel_values[chan->address];

			ret = afe4403_read(afe, reg, val);

			if (ret)

				return ret;
@@ -262,6 +262,7 @@ static int afe4403_read_raw(struct iio_dev *indio_dev, 
	case IIO_CURRENT:

		switch (mask) {

		case IIO_CHAN_INFO_RAW:

			field = afe4403_channel_leds[chan->address];

			ret = regmap_field_read(afe->fields[field], val);

			if (ret)

				return ret;