Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: make bitmap_parse_user a wrapper on bitmap_parse

Browse Source 
Currently we parse user data byte after byte which leads to
overcomplicating of parsing algorithm.  There are no performance critical
users of bitmap_parse_user(), and so we can duplicate user data to kernel
buffer and simply call bitmap_parselist().  This rework lets us unify and
simplify bitmap_parse() and bitmap_parse_user(), which is done in the
following patch.

Link: http://lkml.kernel.org/r/20200102043031.30357-5-yury.norov@gmail.com
Signed-off-by: Yury Norov <yury.norov@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Amritha Nambiar <amritha.nambiar@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: "Tobin C . Harding" <tobin@kernel.org>
Cc: Vineet Gupta <vineet.gupta1@synopsys.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Willem de Bruijn <willemb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yury Norov 2020-02-03 17:37:31 -08:00 committed by Linus Torvalds
parent 7eb2e94e96
commit e66eda0615
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/bitmap.c
View File

@ -530,22 +530,22 @@ EXPORT_SYMBOL(__bitmap_parse);
* then it must be terminated with a \0. * then it must be terminated with a \0.
* @maskp: pointer to bitmap array that will contain result. * @maskp: pointer to bitmap array that will contain result.
* @nmaskbits: size of bitmap, in bits. * @nmaskbits: size of bitmap, in bits.
*
* Wrapper for __bitmap_parse(), providing it with user buffer.
*
* We cannot have this as an inline function in bitmap.h because it needs
* linux/uaccess.h to get the access_ok() declaration and this causes
* cyclic dependencies.
*/ */
int bitmap_parse_user(const char __user *ubuf, int bitmap_parse_user(const char __user *ubuf,
unsigned int ulen, unsigned long *maskp, unsigned int ulen, unsigned long *maskp,
int nmaskbits) int nmaskbits)
{ {
if (!access_ok(ubuf, ulen)) char *buf;
return -EFAULT; int ret;
return __bitmap_parse((const char __force *)ubuf,
ulen, 1, maskp, nmaskbits);
buf = memdup_user_nul(ubuf, ulen);
if (IS_ERR(buf))
return PTR_ERR(buf);
ret = bitmap_parse(buf, ulen, maskp, nmaskbits);
kfree(buf);
return ret;
} }
EXPORT_SYMBOL(bitmap_parse_user); EXPORT_SYMBOL(bitmap_parse_user);