Skip to content

Commit 54246b9

Browse files
M-Vaittinenjic23
authored andcommitted
iio: at91-sama5d2_adc: Fix unsafe buffer attributes
The iio_triggered_buffer_setup_ext() was changed by commit 15097c7 ("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(). 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 IIO_CONST_ATTRs from the driver to IIO_DEVICE_ATTR in order to prevent the invalid memory access. Signed-off-by: Matti Vaittinen <[email protected]> Fixes: 15097c7 ("iio: buffer: wrap all buffer attributes into iio_dev_attr") Tested-by: Claudiu Beznea <[email protected]> Link: https://lore.kernel.org/r/be69775aa302159f088b8b91894e6ec449bca65b.1664782676.git.mazziesaccount@gmail.com Signed-off-by: Jonathan Cameron <[email protected]>
1 parent 4132f19 commit 54246b9

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

drivers/iio/adc/at91-sama5d2_adc.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,17 +2193,30 @@ static ssize_t at91_adc_get_watermark(struct device *dev,
21932193
return scnprintf(buf, PAGE_SIZE, "%d\n", st->dma_st.watermark);
21942194
}
21952195

2196+
static ssize_t hwfifo_watermark_min_show(struct device *dev,
2197+
struct device_attribute *attr,
2198+
char *buf)
2199+
{
2200+
return sysfs_emit(buf, "%s\n", "2");
2201+
}
2202+
2203+
static ssize_t hwfifo_watermark_max_show(struct device *dev,
2204+
struct device_attribute *attr,
2205+
char *buf)
2206+
{
2207+
return sysfs_emit(buf, "%s\n", AT91_HWFIFO_MAX_SIZE_STR);
2208+
}
2209+
21962210
static IIO_DEVICE_ATTR(hwfifo_enabled, 0444,
21972211
at91_adc_get_fifo_state, NULL, 0);
21982212
static IIO_DEVICE_ATTR(hwfifo_watermark, 0444,
21992213
at91_adc_get_watermark, NULL, 0);
2200-
2201-
static IIO_CONST_ATTR(hwfifo_watermark_min, "2");
2202-
static IIO_CONST_ATTR(hwfifo_watermark_max, AT91_HWFIFO_MAX_SIZE_STR);
2214+
static IIO_DEVICE_ATTR_RO(hwfifo_watermark_min, 0);
2215+
static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0);
22032216

22042217
static const struct attribute *at91_adc_fifo_attributes[] = {
2205-
&iio_const_attr_hwfifo_watermark_min.dev_attr.attr,
2206-
&iio_const_attr_hwfifo_watermark_max.dev_attr.attr,
2218+
&iio_dev_attr_hwfifo_watermark_min.dev_attr.attr,
2219+
&iio_dev_attr_hwfifo_watermark_max.dev_attr.attr,
22072220
&iio_dev_attr_hwfifo_watermark.dev_attr.attr,
22082221
&iio_dev_attr_hwfifo_enabled.dev_attr.attr,
22092222
NULL,

0 commit comments

Comments
 (0)