From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Tejun Heo <tj@kernel.org>, <linux-kernel@vger.kernel.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jean Delvare <jdelvare@suse.de>,
Monam Agarwal <monamagarwal123@gmail.com>,
Jeff Layton <jlayton@redhat.com>,
Andreas Gruenbacher <agruen@linbit.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH 5/9 V2] idr: covert BUG_ON() to WARN_ON_ONCE() if the argument is invalid.
Date: Sat, 19 Apr 2014 19:38:12 +0800 [thread overview]
Message-ID: <1397907496-5993-6-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1397907496-5993-1-git-send-email-laijs@cn.fujitsu.com>
When the arguments passed by the caller are invalid, WARN_ON_ONCE()
is proper than BUG_ON() which may crash the kernel.
The invalid-checking for ida_simple_remove() is moved into ida_remove().
idr_remove() also adds this WARN_ON_ONCE().
And when "end < start" in ida_simple_get(), it returns -ENOSPC as
ida_alloc() does.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
lib/idr.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/idr.c b/lib/idr.c
index e79e051..317fd35 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -559,7 +559,7 @@ void idr_remove(struct idr *idp, int id)
struct idr_layer *p;
struct idr_layer *to_free;
- if (id < 0)
+ if (WARN_ON_ONCE(id < 0))
return;
if (id > idr_max(idp->layers)) {
@@ -1030,6 +1030,9 @@ void ida_remove(struct ida *ida, int id)
int n;
struct ida_bitmap *bitmap;
+ if (WARN_ON_ONCE(id < 0))
+ return;
+
if (idr_id > idr_max(ida->idr.layers))
goto err;
@@ -1096,13 +1099,14 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
unsigned int max;
unsigned long flags;
- BUG_ON((int)start < 0);
- BUG_ON((int)end < 0);
+ if (WARN_ON_ONCE(((int)start < 0) || ((int)end < 0)))
+ return -EINVAL;
if (end == 0)
max = 0x80000000;
else {
- BUG_ON(end < start);
+ if (WARN_ON_ONCE(end < start))
+ return -ENOSPC;
max = end - 1;
}
@@ -1138,7 +1142,6 @@ void ida_simple_remove(struct ida *ida, unsigned int id)
{
unsigned long flags;
- BUG_ON((int)id < 0);
spin_lock_irqsave(&simple_ida_lock, flags);
ida_remove(ida, id);
spin_unlock_irqrestore(&simple_ida_lock, flags);
--
1.7.4.4
next prev parent reply other threads:[~2014-04-19 11:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-18 12:49 [PATCH 0/8] idr: fix & cleanup Lai Jiangshan
2014-04-18 12:49 ` [PATCH 1/8] idr: fix overflow bug for the max-high layer Lai Jiangshan
2014-04-18 16:29 ` Tejun Heo
2014-04-18 17:08 ` Lai Jiangshan
2014-04-18 17:10 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 2/8] idr: fix unexpected id-removal when idr_remove(unallocated_id) Lai Jiangshan
2014-04-18 16:57 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 3/8] idr: fix NULL pointer dereference when ida_remove(unallocated_id) Lai Jiangshan
2014-04-18 17:09 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 4/8] idr: fix idr_replace()'s returned error code Lai Jiangshan
2014-04-18 17:12 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 5/8] idr: covert BUG_ON() to WARN_ON_ONCE() if the argument is invalid Lai Jiangshan
2014-04-18 17:14 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 6/8] idr: avoid ping-pong Lai Jiangshan
2014-04-18 17:17 ` Tejun Heo
2014-04-19 10:43 ` Lai Jiangshan
2014-04-19 13:01 ` Tejun Heo
2014-04-19 14:23 ` Lai Jiangshan
2014-04-18 12:49 ` [PATCH 7/8] idr: don't need to shink the free list when idr_remove() Lai Jiangshan
2014-04-18 17:19 ` Tejun Heo
2014-04-18 12:49 ` [PATCH 8/8] idr: reduce the unneeded check in free_layer() Lai Jiangshan
2014-04-18 17:21 ` Tejun Heo
2014-04-19 11:38 ` [PATCH 0/9 V2] idr: fix & cleanup Lai Jiangshan
2014-04-19 11:38 ` [PATCH 1/9 V2] idr: fix overflow bug during maximum ID calculation at maximum height Lai Jiangshan
2014-04-19 11:38 ` [PATCH 2/9 V2] idr: fix unexpected ID-removal when idr_remove(unallocated_id) Lai Jiangshan
2014-04-19 11:38 ` [PATCH 3/9 V2] idr: fix NULL pointer dereference when ida_remove(unallocated_id) Lai Jiangshan
2014-04-19 11:38 ` [PATCH 4/9 V2] idr: fix idr_replace()'s returned error code Lai Jiangshan
2014-04-19 11:38 ` Lai Jiangshan [this message]
2014-04-19 13:07 ` [PATCH 5/9 V2] idr: covert BUG_ON() to WARN_ON_ONCE() if the argument is invalid Tejun Heo
2014-04-19 14:04 ` Lai Jiangshan
2014-04-19 23:47 ` Tejun Heo
2014-04-19 11:38 ` [PATCH 6/9 V2] idr: avoid ping-pong Lai Jiangshan
2014-04-19 11:38 ` [PATCH 7/9 V2] idr: don't need to shink the free list when idr_remove() Lai Jiangshan
2014-04-19 11:38 ` [PATCH 8/9 V2] idr: reduce the unneeded check in free_layer() Lai Jiangshan
2014-04-19 11:38 ` [PATCH 9/9 V2] idr: remove useless C-PreProcessor branch Lai Jiangshan
2014-04-19 23:51 ` Tejun Heo
2014-04-20 3:56 ` Lai Jiangshan
2014-04-20 11:29 ` Tejun Heo
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=1397907496-5993-6-git-send-email-laijs@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=agruen@linbit.com \
--cc=akpm@linux-foundation.org \
--cc=jdelvare@suse.de \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=monamagarwal123@gmail.com \
--cc=stephen@networkplumber.org \
--cc=tj@kernel.org \
/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
all inboxes | Powered by JetHome®