[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4B73C535.7020405@kernel.org>
Date: Thu, 11 Feb 2010 17:52:05 +0900
From: Tejun Heo <tj@...nel.org>
To: Dave Hansen <dave@...ux.vnet.ibm.com>
CC: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
lkml <linux-kernel@...r.kernel.org>,
dri-devel@...ts.sourceforge.net, Dave Airlie <airlied@...il.com>,
Greg KH <greg@...ah.com>, Eric Paris <eparis@...hat.com>
Subject: Re: [PATCH 2.6.33-rc6] idr: revert misallocation bug fix
Hello,
On 02/05/2010 05:58 AM, Dave Hansen wrote:
> Bah. I just ran into and bisected the X startup problem. :)
>
> Let me know when you have a proper fix. I can test on my machine for
> you.
Can you please test the following against the current mainline?
Thanks.
diff --git a/lib/idr.c b/lib/idr.c
index 1cac726..0dc7822 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
/* if already at the top layer, we need to grow */
- if (!(p = pa[l])) {
+ if (id >= 1 << (idp->layers * IDR_BITS)) {
*starting_id = id;
return IDR_NEED_TO_GROW;
}
+ p = pa[l];
+ BUG_ON(!p);
/* If we need to go up one layer, continue the
* loop; otherwise, restart from the top.
--
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists