From: Pan Xinhui <xinhuix.pan@intel.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: akpm@linux-foundation.org, linux@rasmusvillemoes.dk,
tj@kernel.org, peterz@infradead.org, sudeep.holla@arm.com,
mina86@mina86.com, yury.norov@gmail.com,
"mnipxh@163.com" <mnipxh@163.com>
Subject: [PATCH] lib/bitmap.c: return -EINVAL for grouping errors in __bitmap_parselist
Date: Tue, 30 Jun 2015 15:42:53 +0800 [thread overview]
Message-ID: <5592487D.7080006@intel.com> (raw)
Sometimes the input from user may cause an unexpected result.
just like __bitmap_parse, we return -EINVAL if there is no avaiable digit in each
parsing procedures.
Signed-off-by: Pan Xinhui <xinhuix.pan@intel.com>
---
lib/bitmap.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 64c0926..995fca2 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -504,7 +504,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
int nmaskbits)
{
unsigned a, b;
- int c, old_c, totaldigits;
+ int c, old_c, totaldigits, ndigits;
const char __user __force *ubuf = (const char __user __force *)buf;
int exp_digit, in_range;
@@ -514,6 +514,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
exp_digit = 1;
in_range = 0;
a = b = 0;
+ ndigits = 0;
/* Get the next cpu# or a range of cpu#'s */
while (buflen) {
@@ -555,8 +556,10 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
if (!in_range)
a = b;
exp_digit = 0;
- totaldigits++;
+ ndigits++; totaldigits++;
}
+ if (ndigits == 0)
+ return -EINVAL;
if (!(a <= b))
return -EINVAL;
if (b >= nmaskbits)
--
1.9.1
next reply other threads:[~2015-06-29 7:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 7:42 Pan Xinhui [this message]
2015-06-29 13:39 ` [PATCH] lib/bitmap.c: return -EINVAL for grouping errors in __bitmap_parselist Yury Norov
2015-07-01 1:37 ` Pan Xinhui
2015-06-30 8:01 ` [PATCH] lib/bitmap.c: rewrite __bitmap_parse && __bitmap_parselist Pan Xinhui
2015-06-30 8:31 ` [PATCH V2] " Pan Xinhui
2015-06-30 10:02 ` [PATCH V3] " Pan Xinhui
2015-07-01 3:17 ` Pan Xinhui
2015-07-01 9:16 ` Yury
2015-07-01 11:08 ` Pan Xinhui
2015-06-30 8:32 ` [PATCH] lib/bitmap.c: return -EINVAL for grouping errors in __bitmap_parselist Yury Norov
2015-06-30 8:37 ` Pan Xinhui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5592487D.7080006@intel.com \
--to=xinhuix.pan@intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=mina86@mina86.com \
--cc=mnipxh@163.com \
--cc=peterz@infradead.org \
--cc=sudeep.holla@arm.com \
--cc=tj@kernel.org \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox