From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752578Ab0BKIok (ORCPT ); Thu, 11 Feb 2010 03:44:40 -0500 Received: from hera.kernel.org ([140.211.167.34]:55729 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751777Ab0BKIod (ORCPT ); Thu, 11 Feb 2010 03:44:33 -0500 Message-ID: <4B73C50B.5040303@kernel.org> Date: Thu, 11 Feb 2010 17:51:23 +0900 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 MIME-Version: 1.0 To: Stefan Lippers-Hollmann CC: Greg KH , linux-kernel@vger.kernel.org, Eric Paris , akpm@linux-foundation.org, torvalds@linux-foundation.org, stable@kernel.org Subject: Re: patch idr-fix-a-critical-misallocation-bug.patch added to 2.6.32-stable tree References: <12651725962428@site> <201002040446.05068.s.L-H@gmx.de> <4B6A4576.5050401@kernel.org> <201002041641.21063.s.L-H@gmx.de> In-Reply-To: <201002041641.21063.s.L-H@gmx.de> X-Enigmail-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Thu, 11 Feb 2010 08:44:09 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, Can you please test the following patch on top of 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