Commit 8ec3d768 authored Oct 30, 2018 by Rasmus Villemoes Committed by Linus Torvalds Oct 31, 2018

lib/bitmap.c: simplify bitmap_print_to_pagebuf()

len is guaranteed to lie in [1, PAGE_SIZE].  If scnprintf is called with a
buffer size of 1, it is guaranteed to return 0.  So in the extremely
unlikely case of having just one byte remaining in the page, let's just
call scnprintf anyway.  The only difference is that this will write a '\0'
to that final byte in the page, but that's an improvement: We now
guarantee that after the call, buf is a properly terminated C string of
length exactly the return value.

Link: http://lkml.kernel.org/r/20180818131623.8755-8-linux@rasmusvillemoes.dk


Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Yury Norov <ynorov@caviumnetworks.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ce1091d4

lib/bitmap.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -471,12 +471,9 @@ int bitmap_print_to_pagebuf(bool list, char buf, const unsigned long maskp,
		int nmaskbits)
		{
		ptrdiff_t len = PAGE_SIZE - offset_in_page(buf);
		int n = 0;

		if (len > 1)
		n = list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) :
		return list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) :
		scnprintf(buf, len, "%*pb\n", nmaskbits, maskp);
		return n;
		}
		EXPORT_SYMBOL(bitmap_print_to_pagebuf);

Admin message