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

!12819 iio: health: afe4404: Fix oob read in afe4404_[read|write 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Ruifeng <linruifeng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EJAWCJ56O66UTQSTVKG2T2WFFMRT6BDF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYREK 
 
Link:https://gitee.com/openeuler/kernel/pulls/12819

 

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

drivers/iio/health/afe4404.c

+7 −5
Original line number Diff line number Diff line
@@ -250,20 +250,20 @@ static int afe4404_read_raw(struct iio_dev *indio_dev, 
			    int *val, int *val2, long mask)

{

	struct afe4404_data *afe = iio_priv(indio_dev);

	unsigned int value_reg = afe4404_channel_values[chan->address];

	unsigned int led_field = afe4404_channel_leds[chan->address];

	unsigned int offdac_field = afe4404_channel_offdacs[chan->address];

	unsigned int value_reg, led_field, offdac_field;

	int ret;



	switch (chan->type) {

	case IIO_INTENSITY:

		switch (mask) {

		case IIO_CHAN_INFO_RAW:

			value_reg = afe4404_channel_values[chan->address];

			ret = regmap_read(afe->regmap, value_reg, val);

			if (ret)

				return ret;

			return IIO_VAL_INT;

		case IIO_CHAN_INFO_OFFSET:

			offdac_field = afe4404_channel_offdacs[chan->address];

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

			if (ret)

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

		switch (mask) {

		case IIO_CHAN_INFO_RAW:

			led_field = afe4404_channel_leds[chan->address];

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

			if (ret)

				return ret;
@@ -295,19 +296,20 @@ static int afe4404_write_raw(struct iio_dev *indio_dev, 
			     int val, int val2, long mask)

{

	struct afe4404_data *afe = iio_priv(indio_dev);

	unsigned int led_field = afe4404_channel_leds[chan->address];

	unsigned int offdac_field = afe4404_channel_offdacs[chan->address];

	unsigned int led_field, offdac_field;



	switch (chan->type) {

	case IIO_INTENSITY:

		switch (mask) {

		case IIO_CHAN_INFO_OFFSET:

			offdac_field = afe4404_channel_offdacs[chan->address];

			return regmap_field_write(afe->fields[offdac_field], val);

		}

		break;

	case IIO_CURRENT:

		switch (mask) {

		case IIO_CHAN_INFO_RAW:

			led_field = afe4404_channel_leds[chan->address];

			return regmap_field_write(afe->fields[led_field], val);

		}

		break;