Subject: [to-be-updated] idr-proper-invalid-argument-handling.patch removed from -mm tree
To: laijs@xxxxxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 22 Apr 2014 13:00:13 -0700
The patch titled
Subject: idr: proper invalid argument handling
has been removed from the -mm tree. Its filename was
idr-proper-invalid-argument-handling.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Subject: idr: proper invalid argument handling
When the arguments passed by the caller are invalid, WARN_ON_ONCE() is
better than BUG_ON() which may crash the kernel.
ida_remove()/idr_remove(): add checks for "id < 0".
BUG_ON() in ida_simple_remove() is simply removed, due to
ida_remove() already checking for "id < 0".
In idr_alloc(), it still returns -ENOSPC when "start == end", but it
returns -EINVAL when "max < start" while old code returns -ENOSPC.
-EINVAL is proper here, the caller must passed wrong arguments.
ida_simple_get()'s argument-checks are changed as the same as idr_alloc().
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/idr.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff -puN lib/idr.c~idr-proper-invalid-argument-handling lib/idr.c
--- a/lib/idr.c~idr-proper-invalid-argument-handling
+++ a/lib/idr.c
@@ -459,8 +459,10 @@ int idr_alloc(struct idr *idr, void *ptr
/* sanity checks */
if (WARN_ON_ONCE(start < 0))
return -EINVAL;
- if (unlikely(max < start))
+ if (unlikely(end > 0 && start == end))
return -ENOSPC;
+ if (WARN_ON_ONCE(max < start))
+ return -EINVAL;
/* allocate id */
id = idr_get_empty_slot(idr, start, pa, gfp_mask, NULL);
@@ -553,10 +555,7 @@ void idr_remove(struct idr *idp, int id)
struct idr_layer *p;
struct idr_layer *to_free;
- if (id < 0)
- return;
-
- if (id > idr_max(idp->layers)) {
+ if (id < 0 || id > idr_max(idp->layers)) {
idr_remove_warning(id);
return;
}
@@ -1014,7 +1013,7 @@ void ida_remove(struct ida *ida, int id)
int n;
struct ida_bitmap *bitmap;
- if (idr_id > idr_max(ida->idr.layers))
+ if (id < 0 || idr_id > idr_max(ida->idr.layers))
goto err;
/* clear full bits while looking up the leaf idr_layer */
@@ -1080,14 +1079,17 @@ int ida_simple_get(struct ida *ida, unsi
unsigned int max;
unsigned long flags;
- BUG_ON((int)start < 0);
- BUG_ON((int)end < 0);
+ if (WARN_ON_ONCE((int)start < 0))
+ return -EINVAL;
- if (end == 0)
- max = 0x80000000;
+ if ((int)end <= 0)
+ max = INT_MAX;
else {
- BUG_ON(end < start);
max = end - 1;
+ if (unlikely(start == end))
+ return -ENOSPC;
+ if (WARN_ON_ONCE(max < start))
+ return -EINVAL;
}
again:
@@ -1122,7 +1124,6 @@ void ida_simple_remove(struct ida *ida,
{
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);
_
Patches currently in -mm which might be from laijs@xxxxxxxxxxxxxx are
mem-hotplug-implement-get-put_online_mems.patch
slab-get_online_mems-for-kmem_cache_createdestroyshrink.patch
idr-fix-overflow-bug-during-maximum-id-calculation-at-maximum-height.patch
idr-fix-unexpected-id-removal-when-idr_removeunallocated_id.patch
idr-fix-null-pointer-dereference-when-ida_removeunallocated_id.patch
idr-fix-idr_replaces-returned-error-code.patch
idr-dont-need-to-shink-the-free-list-when-idr_remove.patch
idr-reduce-the-unneeded-check-in-free_layer.patch
idr-reduce-the-number-of-max_idr_free.patch
ida-in-place-ida-allocation.patch
idr-reorder-the-fields.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
