Commit ce1091d4 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds

lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf

For various alignments of buf, the current expression computes

4096 ok
4095 ok
8190
8189
...
4097

i.e., if the caller has already written two bytes into the page buffer,
len is 8190 rather than 4094, because PTR_ALIGN aligns up to the next
boundary.  So if the printed version of the bitmap is huge, scnprintf()
ends up writing beyond the page boundary.

I don't think any current callers actually write anything before
bitmap_print_to_pagebuf, but the API seems to be designed to allow it.

[akpm@linux-foundation.org: use offset_in_page(), per Andy]
[akpm@linux-foundation.org: include mm.h for offset_in_page()]
Link: http://lkml.kernel.org/r/20180818131623.8755-7-linux@rasmusvillemoes.dkSigned-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarAndy 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 41e7b166
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -461,14 +462,15 @@ EXPORT_SYMBOL(bitmap_parse_user); ...@@ -461,14 +462,15 @@ EXPORT_SYMBOL(bitmap_parse_user);
* ranges if list is specified or hex digits grouped into comma-separated * ranges if list is specified or hex digits grouped into comma-separated
* sets of 8 digits/set. Returns the number of characters written to buf. * sets of 8 digits/set. Returns the number of characters written to buf.
* *
* It is assumed that @buf is a pointer into a PAGE_SIZE area and that * It is assumed that @buf is a pointer into a PAGE_SIZE, page-aligned
* sufficient storage remains at @buf to accommodate the * area and that sufficient storage remains at @buf to accommodate the
* bitmap_print_to_pagebuf() output. * bitmap_print_to_pagebuf() output. Returns the number of characters
* actually printed to @buf, excluding terminating '\0'.
*/ */
int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp, int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp,
int nmaskbits) int nmaskbits)
{ {
ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf; ptrdiff_t len = PAGE_SIZE - offset_in_page(buf);
int n = 0; int n = 0;
if (len > 1) if (len > 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment