From 80283e6aea8d9d8b48d4746b9b42883d803bee13 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 1 Feb 2022 02:36:16 +0100 Subject: util: Avoid return of possibly truncated unsigned long in bitmap_isset() Oops. If *word & BITMAP_BIT(bit) is bigger than an int (which is the case for half of the possible bits of a bitmap on 64-bit archs), we'll return that as an int, that is, zero, even if the bit at hand is set. Just return zero or one there, no callers are interested in the actual bitmap as return value. Issue found as pasta wouldn't automatically detect some bound ports. Signed-off-by: Stefano Brivio --- util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 57b987a..94d49a6 100644 --- a/util.c +++ b/util.c @@ -366,13 +366,13 @@ void bitmap_clear(uint8_t *map, int bit) * @map: Pointer to bitmap * @bit: Bit number to check * - * Return: non-zero if given bit is set, zero if it's not + * Return: one if given bit is set, zero if it's not */ int bitmap_isset(const uint8_t *map, int bit) { unsigned long *word = (unsigned long *)map + BITMAP_WORD(bit); - return *word & BITMAP_BIT(bit); + return !!(*word & BITMAP_BIT(bit)); } /** -- cgit v1.2.3