diff options
| author |   Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2014-08-06 16:10:22 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 18:01:27 -0700 |
| commit | 7e5f97d1927f41affa21aa5b321865ceab1994ce (patch) | |
| tree | 671aaafdac301ef670434667f4b157cd127d8525 /include/linux/bitmap.h | |
| parent | lib: bitmap: add missing mask in bitmap_shift_right (diff) | |
| download | linux-dev-7e5f97d1927f41affa21aa5b321865ceab1994ce.tar.xz linux-dev-7e5f97d1927f41affa21aa5b321865ceab1994ce.zip | |
lib: bitmap: add missing mask in bitmap_and
Apparently, bitmap_and is supposed to return whether the new bitmap is
empty. But it didn't take potential garbage bits in the last word into
account.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/bitmap.h')
| -rw-r--r-- | include/linux/bitmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 75df61d9ecfb..3399a9ecd991 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -191,7 +191,7 @@ static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, const unsigned long *src2, unsigned int nbits) { if (small_const_nbits(nbits)) - return (*dst = *src1 & *src2) != 0; + return (*dst = *src1 & *src2 & BITMAP_LAST_WORD_MASK(nbits)) != 0; return __bitmap_and(dst, src1, src2, nbits); } |