The patch titled Subject: lib: bitmap: add missing mask in bitmap_and has been added to the -mm tree. Its filename is lib-bitmap-add-missing-mask-in-bitmap_and.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/lib-bitmap-add-missing-mask-in-bitmap_and.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/lib-bitmap-add-missing-mask-in-bitmap_and.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/bitmap.h | 2 +- lib/bitmap.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff -puN include/linux/bitmap.h~lib-bitmap-add-missing-mask-in-bitmap_and include/linux/bitmap.h --- a/include/linux/bitmap.h~lib-bitmap-add-missing-mask-in-bitmap_and +++ a/include/linux/bitmap.h @@ -191,7 +191,7 @@ static inline int bitmap_and(unsigned lo 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); } diff -puN lib/bitmap.c~lib-bitmap-add-missing-mask-in-bitmap_and lib/bitmap.c --- a/lib/bitmap.c~lib-bitmap-add-missing-mask-in-bitmap_and +++ a/lib/bitmap.c @@ -185,11 +185,14 @@ int __bitmap_and(unsigned long *dst, con const unsigned long *bitmap2, unsigned int bits) { unsigned int k; - unsigned int nr = BITS_TO_LONGS(bits); + unsigned int lim = bits/BITS_PER_LONG; unsigned long result = 0; - for (k = 0; k < nr; k++) + for (k = 0; k < lim; k++) result |= (dst[k] = bitmap1[k] & bitmap2[k]); + if (bits % BITS_PER_LONG) + result |= (dst[k] = bitmap1[k] & bitmap2[k] & + BITMAP_LAST_WORD_MASK(bits)); return result != 0; } EXPORT_SYMBOL(__bitmap_and); _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are lib-list_sort_test-return-enomem-when-allocation-fails.patch lib-list_sort_test-add-extra-corruption-check.patch lib-list_sort_test-simplify-and-harden-cleanup.patch lib-list_sortc-limit-number-of-unused-cmp-callbacks.patch lib-list_sortc-convert-to-pr_foo.patch lib-list_sortc-convert-to-pr_foo-fix.patch lib-bitmap-make-nbits-parameter-of-bitmap_empty-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_full-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_equal-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_complement-unsigned.patch lib-bitmap-remove-unnecessary-mask-from-bitmap_complement.patch lib-bitmap-make-nbits-parameter-of-bitmap_andorxorandnot-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_intersects-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_subset-unsigned.patch lib-bitmap-make-nbits-parameter-of-bitmap_weight-unsigned.patch lib-bitmap-make-the-start-index-of-bitmap_set-unsigned.patch lib-bitmap-make-the-start-index-of-bitmap_clear-unsigned.patch lib-bitmap-simplify-bitmap_parselist.patch lib-bitmap-fix-typo-in-kerneldoc-for-bitmap_pos_to_ord.patch lib-bitmap-change-parameter-of-bitmap__region-to-unsigned.patch lib-bitmap-micro-optimize-bitmap_allocate_region.patch lib-bitmap-add-missing-mask-in-bitmap_shift_right.patch lib-bitmap-add-missing-mask-in-bitmap_and.patch lib-bitmap-add-missing-mask-in-bitmap_andnot.patch checkpatchpl-also-suggest-else-if-when-if-follows-brace.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html