Skip to contentSkip to conversation

avoid negative (and full-width) shifts in radix-tree.c, take 3

PATCH In review Peter Lund 3 participants 3 messages Aug 29, 2007 – Aug 30, 2007 Library code

lore
Share & tools
lore

Peter Lund

author
#0 lore raw

PATCH 1/1 avoid negative (and full-width) shifts in radix-tree.c, take 3

From: Peter Lund <[email protected]>

Negative shifts are not allowed in C (the result is undefined). Same thing with full-width shifts.

It works on most platforms but not on the VAX with gcc 4.0.1 (it results in an "operand reserved" fault).

Applies to Linux 2.6.22.

---
Shifting by more than the width of the value on the left is also not allowed. I think the extra '>> 1' tacked on at the end in the original code was an attempt to work around that. Getting rid of that is an extra feature of this patch.

Here's the chapter and verse, taken from the final draft of the C99 standard ("6.5.7 Bitwise shift operators", paragraph 3):

"The integer promotions are performed on each of the operands. The type of the result is that of the promoted left operand. If the value of the right operand is negative or is greater than or equal to the width of the promoted left operand, the behavior is undefined."

Thank you to Jan-Benedict Glaw, Christoph Hellwig, Maciej Rozycki, Pekka Enberg, and Andreas Schwab for review. Special thanks to Andreas for spotting something I knew but overlooked due to misfiring neurons.

I have kept the spacing between the variables and their types so the variable names and the equal signs don't line up, which should keep the majority of my reviewers happy.

lib/radix-tree.c renamed from lib/radix-tree.c.orig +7 -5
@@ -980,12 +980,14 @@
 
 static __init unsigned long __maxindex(unsigned int height)
 {
-	unsigned int tmp = height * RADIX_TREE_MAP_SHIFT;
-	unsigned long index = (~0UL >> (RADIX_TREE_INDEX_BITS - tmp - 1)) >> 1;
+	unsigned int width = height * RADIX_TREE_MAP_SHIFT;
+	int shift = RADIX_TREE_INDEX_BITS - width;
 
-	if (tmp >= RADIX_TREE_INDEX_BITS)
-		index = ~0UL;
-	return index;
+	if (shift < 0)
+		return ~0UL;
+	if (shift >= 8 * sizeof(unsigned long))
+		return 0UL;
+	return ~0UL >> shift;
 }
 
 static __init void radix_tree_init_maxindex(void)
#1 lore raw

lib/radix-tree.c line 988

Quoted 7 lines · Peter Lund
lib/radix-tree.c renamed from lib/radix-tree.c.orig +3 -3
-	if (tmp >= RADIX_TREE_INDEX_BITS)
-		index = ~0UL;
-	return index;
+	if (shift < 0)
+		return ~0UL;
+	if (shift >= 8 * sizeof(unsigned long))

8* sizeof(unsigned long) is the constant BITS_PER_LONG.

#2 lore raw
Quoted 11 lines · Christoph Lameter

lib/radix-tree.c line 988

Quoted 7 lines · Peter Lund
lib/radix-tree.c renamed from lib/radix-tree.c.orig +3 -3
-	if (tmp >= RADIX_TREE_INDEX_BITS)
-		index = ~0UL;
-	return index;
+	if (shift < 0)
+		return ~0UL;
+	if (shift >= 8 * sizeof(unsigned long))

8* sizeof(unsigned long) is the constant BITS_PER_LONG.

Or in this context: RADIX_TREE_INDEX_BITS, which happens to be the old check, which just needed to be extended to cover negative shifts.

Björn