Commit e70c70c3 authored by Andrew Rybchenko's avatar Andrew Rybchenko Committed by David S. Miller

sfc: fix potential stack corruption from running past stat bitmask

On 32-bit systems, mask is only an array of 3 longs, not 4, so don't try
to write to mask[3].
Also include build-time checks in case the size of the bitmask changes.

Fixes: 3c36a2ad ("sfc: display vadaptor statistics for all interfaces")
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c1f5b45
...@@ -1517,13 +1517,14 @@ static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask) ...@@ -1517,13 +1517,14 @@ static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask)
} }
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
BUILD_BUG_ON(BITS_TO_LONGS(EF10_STAT_COUNT) != 2);
mask[0] = raw_mask[0]; mask[0] = raw_mask[0];
mask[1] = raw_mask[1]; mask[1] = raw_mask[1];
#else #else
BUILD_BUG_ON(BITS_TO_LONGS(EF10_STAT_COUNT) != 3);
mask[0] = raw_mask[0] & 0xffffffff; mask[0] = raw_mask[0] & 0xffffffff;
mask[1] = raw_mask[0] >> 32; mask[1] = raw_mask[0] >> 32;
mask[2] = raw_mask[1] & 0xffffffff; mask[2] = raw_mask[1] & 0xffffffff;
mask[3] = raw_mask[1] >> 32;
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment