Skip to content

Commit

Permalink
iio: iio-utils: Fix possible incorrect mask calculation
Browse files Browse the repository at this point in the history
[ Upstream commit 208a68c8393d6041a90862992222f3d7943d44d6 ]

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 <[email protected]> in
iio-sensor-proxy:
hadess/iio-sensor-proxy@9615cea

Signed-off-by: Bastien Nocera <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
hadess authored and gregkh committed Aug 4, 2019
1 parent 5086e47 commit e2482f7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/iio/iio_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used,
*be = (endianchar == 'b');
*bytes = padint / 8;
if (*bits_used == 64)
*mask = ~0;
*mask = ~(0ULL);
else
*mask = (1ULL << *bits_used) - 1;
*mask = (1ULL << *bits_used) - 1ULL;

*is_signed = (signchar == 's');
if (fclose(sysfsfp)) {
Expand Down

0 comments on commit e2482f7

Please sign in to comment.