1 files changed, 8 insertions, 0 deletions

diff --git a/lib/idr.c b/lib/idr.c
index 4df67928816e..c4afd94bdf69 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -562,6 +562,11 @@ void idr_remove(struct idr *idp, int id)
         if (id < 0)
                 return;
 
+        if (id > idr_max(idp->layers)) {
+                idr_remove_warning(id);
+                return;
+        }
+
         sub_remove(idp, (idp->layers - 1) * IDR_BITS, id);
         if (idp->top && idp->top->count == 1 && (idp->layers > 1) &&
             idp->top->ary[0]) {
@@ -1025,6 +1030,9 @@ void ida_remove(struct ida *ida, int id)
         int n;
         struct ida_bitmap *bitmap;
 
+        if (idr_id > idr_max(ida->idr.layers))
+                goto err;
+
         /* clear full bits while looking up the leaf idr_layer */
         while ((shift > 0) && p) {
                 n = (idr_id >> shift) & IDR_MASK;