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

!12852 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/ZKIRGQADBRXO6O5JSEEVHWEJ7IGGFUNN/ 
 
https://gitee.com/openeuler/kernel/issues/IAYRDV 
 
Link:https://gitee.com/openeuler/kernel/pulls/12852

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents eb29929f 6ab8d680

drivers/iio/health/afe4403.c

+3 −2
Original line number Diff line number Diff line
@@ -250,14 +250,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;
@@ -267,6 +267,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;