Skip to content

Commit 623c3a6

Browse files
hadessgregkh
authored andcommitted
iio: iio-utils: Fix possible incorrect mask calculation
[ Upstream commit 208a68c ] On some machines, iio-sensor-proxy was returning all 0's for IIO sensor values. It turns out that the bits_used for this sensor is 32, which makes the mask calculation: *mask = (1 << 32) - 1; If the compiler interprets the 1 literals as 32-bit ints, it generates undefined behavior depending on compiler version and optimization level. On my system, it optimizes out the shift, so the mask value becomes *mask = (1) - 1; With a mask value of 0, iio-sensor-proxy will always return 0 for every axis. Avoid incorrect 0 values caused by compiler optimization. See original fix by Brett Dutro <brett.dutro@gmail.com> in iio-sensor-proxy: hadess/iio-sensor-proxy@9615cea Signed-off-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4a5fd96 commit 623c3a6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tools/iio/iio_utils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used,
163163
*be = (endianchar == 'b');
164164
*bytes = padint / 8;
165165
if (*bits_used == 64)
166-
*mask = ~0;
166+
*mask = ~(0ULL);
167167
else
168-
*mask = (1ULL << *bits_used) - 1;
168+
*mask = (1ULL << *bits_used) - 1ULL;
169169

170170
*is_signed = (signchar == 's');
171171
if (fclose(sysfsfp)) {

0 commit comments

Comments
 (0)