Commit 0a33755c authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Jonathan Cameron
Browse files

iio: Don't silently expect attribute types 



The iio_triggered_buffer_setup_ext() and the
devm_iio_kfifo_buffer_setup_ext() were changed by
commit 15097c7a ("iio: buffer: wrap all buffer attributes into iio_dev_attr")
to silently expect that all attributes given in buffer_attrs array are
device-attributes. This expectation was not forced by the API - and some
drivers did register attributes created by IIO_CONST_ATTR().

When using IIO_CONST_ATTRs the added attribute "wrapping" does not copy
the pointer to stored string constant and when the sysfs file is read the
kernel will access to invalid location.

Change the function signatures to expect an array of iio_dev_attrs to
avoid similar errors in the future.

Merge conflict resolved whilst applying due to patch crossing with
two new drivers (kx022a accelerometer and ad4130 ADC).

Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Tested-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/63f54787a684eb1232f1c5d275a09c786987fe4a.1664782676.git.mazziesaccount@gmail.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent c1531e3a

drivers/iio/accel/adxl367.c

+5 −5
Original line number Diff line number Diff line
@@ -1191,11 +1191,11 @@ static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, 
static IIO_DEVICE_ATTR(hwfifo_enabled, 0444,

		       adxl367_get_fifo_enabled, NULL, 0);



static const struct attribute *adxl367_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark_max.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark.dev_attr.attr,

	&iio_dev_attr_hwfifo_enabled.dev_attr.attr,

static const struct iio_dev_attr *adxl367_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min,

	&iio_dev_attr_hwfifo_watermark_max,

	&iio_dev_attr_hwfifo_watermark,

	&iio_dev_attr_hwfifo_enabled,

	NULL,

};

drivers/iio/accel/adxl372.c

+5 −5
Original line number Diff line number Diff line
@@ -1006,11 +1006,11 @@ static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, 
static IIO_DEVICE_ATTR(hwfifo_enabled, 0444,

		       adxl372_get_fifo_enabled, NULL, 0);



static const struct attribute *adxl372_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark_max.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark.dev_attr.attr,

	&iio_dev_attr_hwfifo_enabled.dev_attr.attr,

static const struct iio_dev_attr *adxl372_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min,

	&iio_dev_attr_hwfifo_watermark_max,

	&iio_dev_attr_hwfifo_watermark,

	&iio_dev_attr_hwfifo_enabled,

	NULL,

};

drivers/iio/accel/bmc150-accel-core.c

+6 −6
Original line number Diff line number Diff line
@@ -933,11 +933,11 @@ static IIO_DEVICE_ATTR(hwfifo_enabled, S_IRUGO, 
static IIO_DEVICE_ATTR(hwfifo_watermark, S_IRUGO,

		       bmc150_accel_get_fifo_watermark, NULL, 0);



static const struct attribute *bmc150_accel_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark_max.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark.dev_attr.attr,

	&iio_dev_attr_hwfifo_enabled.dev_attr.attr,

static const struct iio_dev_attr *bmc150_accel_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min,

	&iio_dev_attr_hwfifo_watermark_max,

	&iio_dev_attr_hwfifo_watermark,

	&iio_dev_attr_hwfifo_enabled,

	NULL,

};
@@ -1665,7 +1665,7 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, 
			    enum bmc150_type type, const char *name,

			    bool block_supported)

{

	const struct attribute **fifo_attrs;

	const struct iio_dev_attr **fifo_attrs;

	struct bmc150_accel_data *data;

	struct iio_dev *indio_dev;

	int ret;

drivers/iio/accel/kionix-kx022a.c

+3 −3
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ static ssize_t hwfifo_watermark_show(struct device *dev, 
static IIO_DEVICE_ATTR_RO(hwfifo_enabled, 0);

static IIO_DEVICE_ATTR_RO(hwfifo_watermark, 0);



static const struct attribute *kx022a_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark.dev_attr.attr,

	&iio_dev_attr_hwfifo_enabled.dev_attr.attr,

static const struct iio_dev_attr *kx022a_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark,

	&iio_dev_attr_hwfifo_enabled,

	NULL

};

drivers/iio/adc/ad4130.c

+5 −5
Original line number Diff line number Diff line
@@ -1380,11 +1380,11 @@ static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0); 
static IIO_DEVICE_ATTR_RO(hwfifo_watermark, 0);

static IIO_DEVICE_ATTR_RO(hwfifo_enabled, 0);



static const struct attribute *ad4130_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark_max.dev_attr.attr,

	&iio_dev_attr_hwfifo_watermark.dev_attr.attr,

	&iio_dev_attr_hwfifo_enabled.dev_attr.attr,

static const struct iio_dev_attr *ad4130_fifo_attributes[] = {

	&iio_dev_attr_hwfifo_watermark_min,

	&iio_dev_attr_hwfifo_watermark_max,

	&iio_dev_attr_hwfifo_watermark,

	&iio_dev_attr_hwfifo_enabled,

	NULL

};