Skip to contentSkip to conversation

iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.

PATCH In review Young Xiao 3 participants 3 messages Jun 4, 2019 – Jun 8, 2019 IIO

lore
Share & tools
lore

Young Xiao

author
#0 lore raw

PATCH 1/1 iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.

The incorrect limit for the for_each_set_bit loop was noticed whilst fixing this other case. Note that as we only have 3 possible entries a the moment and the value was set to 4, the bug would not have any effect currently. It will bite fairly soon though, so best fix it now.

See commit ef4b4856593f ("iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.") for details.

---
 drivers/iio/industrialio-core.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/industrialio-core.c +2 -0
index f5a4581..dd8873a 100644
@@ -1107,6 +1107,8 @@ static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev,
 	char *avail_postfix;
 
 	for_each_set_bit(i, infomask, sizeof(*infomask) * 8) {
+		if (i >= ARRAY_SIZE(iio_chan_info_postfix))
+			return -EINVAL;
 		avail_postfix = kasprintf(GFP_KERNEL,
 					  "%s_available",
 					  iio_chan_info_postfix[i]);
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Young Xiao

[External]

The incorrect limit for the for_each_set_bit loop was noticed whilst fixing this other case. Note that as we only have 3 possible entries a the moment and the value was set to 4, the bug would not have any effect currently. It will bite fairly soon though, so best fix it now.

Quoted 4 lines

See commit ef4b4856593f ("iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.") for details.

Thanks for this patch.
This fix is validated also by the fact that iio_device_add_info_mask_type() has this check on the same iteration.

Quoted 20 lines
---
 drivers/iio/industrialio-core.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/industrialio-core.c +2 -1
index f5a4581..dd8873a 100644
@@ -1107,6 +1107,8 @@ static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev,
        char *avail_postfix;
 
        for_each_set_bit(i, infomask, sizeof(*infomask) * 8) {
+               if (i >= ARRAY_SIZE(iio_chan_info_postfix))
+                       return -EINVAL;
                avail_postfix = kasprintf(GFP_KERNEL,
                                          "%s_available",
                                          iio_chan_info_postfix[i]);
--

2.7.4

maintainer
#2 lore raw
Quoted 12 lines · Alexandru
Quoted 11 lines · Young Xiao

[External]

The incorrect limit for the for_each_set_bit loop was noticed whilst fixing this other case. Note that as we only have 3 possible entries a the moment and the value was set to 4, the bug would not have any effect currently. It will bite fairly soon though, so best fix it now.

See commit ef4b4856593f ("iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.") for details.

Quoted 6 lines
Quoted 1 line

Thanks for this patch.
This fix is validated also by the fact that iio_device_add_info_mask_type() has this check on the same iteration.

I don't think it is technically a bug, as the higher bits should never be set. Still it is a sensible bit of hardening so applied to the togreg branch of iio.git and pushed out as testing.

Thanks

Jonathan

Quoted 22 lines
Quoted 22 lines

---
 drivers/iio/industrialio-core.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/industrialio-core.c +2 -1
index f5a4581..dd8873a 100644
@@ -1107,6 +1107,8 @@ static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev,
        char *avail_postfix;
 
        for_each_set_bit(i, infomask, sizeof(*infomask) * 8) {
+               if (i >= ARRAY_SIZE(iio_chan_info_postfix))
+                       return -EINVAL;
                avail_postfix = kasprintf(GFP_KERNEL,
                                          "%s_available",
                                          iio_chan_info_postfix[i]);
--

2.7.4