Commit 430d275a399175c7c0673459738979287ec1fd22

Authored by Peter Lund
Committed by Linus Torvalds
1 parent 22e48eaf58

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

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).

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, Andreas Schwab, and Christoph Lameter for review.  Special thanks
to Andreas for spotting that my fix only removed half the undefined
behaviour.

Signed-off-by: Peter Lund <firefly@vax64.dk>
Christoph Lameter <clameter@sgi.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Andreas Schwab <schwab@suse.de>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: WU Fengguang <wfg@mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 8 additions and 6 deletions Side-by-side Diff

... ... @@ -1049,12 +1049,14 @@
1049 1049  
1050 1050 static __init unsigned long __maxindex(unsigned int height)
1051 1051 {
1052   - unsigned int tmp = height * RADIX_TREE_MAP_SHIFT;
1053   - unsigned long index = (~0UL >> (RADIX_TREE_INDEX_BITS - tmp - 1)) >> 1;
  1052 + unsigned int width = height * RADIX_TREE_MAP_SHIFT;
  1053 + int shift = RADIX_TREE_INDEX_BITS - width;
1054 1054  
1055   - if (tmp >= RADIX_TREE_INDEX_BITS)
1056   - index = ~0UL;
1057   - return index;
  1055 + if (shift < 0)
  1056 + return ~0UL;
  1057 + if (shift >= BITS_PER_LONG)
  1058 + return 0UL;
  1059 + return ~0UL >> shift;
1058 1060 }
1059 1061  
1060 1062 static __init void radix_tree_init_maxindex(void)