Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

idr: fix a critical misallocation bug, take#2

This is retry of reverted 859ddf09743a8cc680af33f7259ccd0fd36bfe9d
("idr: fix a critical misallocation bug") which contained two bugs.

* pa[idp->layers] should be cleared even if it's not used by
sub_alloc() because it's used by mark idr_mark_full().

* The original condition check also assigned pa[l] to p which the new
code didn't do thus leaving p pointing at the wrong layer.

Both problems have been fixed and the idr code has received good amount
testing using userland testing setup where simple bitmap allocator is
run parallel to verify the result of idr allocation.

The bug this patch fixes is caused by sub_alloc() optimization path
bypassing out-of-room condition check and restarting allocation loop
with starting value higher than maximum allowed value. For detailed
description, please read commit message of 859ddf09.

Signed-off-by: Tejun Heo <tj@kernel.org>
Based-on-patch-from: Eric Paris <eparis@redhat.com>
Reported-by: Eric Paris <eparis@redhat.com>
Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Tejun Heo and committed by
Linus Torvalds
d2e7276b 70118837

+3 -1
+3 -1
lib/idr.c
··· 156 156 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 157 157 158 158 /* if already at the top layer, we need to grow */ 159 - if (!(p = pa[l])) { 159 + if (id >= 1 << (idp->layers * IDR_BITS)) { 160 160 *starting_id = id; 161 161 return IDR_NEED_TO_GROW; 162 162 } 163 + p = pa[l]; 164 + BUG_ON(!p); 163 165 164 166 /* If we need to go up one layer, continue the 165 167 * loop; otherwise, restart from the top.