lkml.org 
[lkml]   [2014]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/8] idr: covert BUG_ON() to WARN_ON_ONCE() if the argument is invalid.
Date
When the arguments passed by the caller are invalid, WARN_ON_ONCE()
is proper than BUG_ON() which may crash the kernel.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
lib/idr.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/idr.c b/lib/idr.c
index 104f87f..e4f9965 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -1093,13 +1093,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 -EINVAL;
max = end - 1;
}

@@ -1135,7 +1136,7 @@ void ida_simple_remove(struct ida *ida, unsigned int id)
{
unsigned long flags;

- BUG_ON((int)id < 0);
+ WARN_ON_ONCE((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


\
 
 \ /
  Last update: 2014-04-18 16:41    [W:0.141 / U:0.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site