| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <21d7e9970812091340p5121e8f8l1e2411035331e8d0@mail.gmail.com>
Date: Wed, 10 Dec 2008 07:40:58 +1000
From: "Dave Airlie" <airlied@...il.com>
To: "Greg KH" <gregkh@...e.de>
Cc: linux-kernel@...r.kernel.org, stable@...nel.org,
"Justin Forbes" <jmforbes@...uxtx.org>,
"Zwane Mwaikambo" <zwane@....linux.org.uk>,
"Theodore Ts'o" <tytso@....edu>,
"Randy Dunlap" <rdunlap@...otime.net>,
"Dave Jones" <davej@...hat.com>,
"Chuck Wolber" <chuckw@...ntumlinux.com>,
"Chris Wedgwood" <reviews@...cw.f00f.org>,
"Michael Krufky" <mkrufky@...uxtv.org>,
"Chuck Ebbert" <cebbert@...hat.com>,
"Domenico Andreoli" <cavokz@...il.com>, "Willy Tarreau" <w@....eu>,
"Rodrigo Rubira Branco" <rbranco@...checkpoint.com>,
"Jake Edge" <jake@....net>, "Eugene Teo" <eteo@...hat.com>,
torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk,
"Manfred Spraul" <manfred@...orfullife.com>,
"Clement Calmels" <cboulte@...il.com>,
"Nadia Derbey" <Nadia.Derbey@...l.net>,
"Pierre Peiffer" <peifferp@...il.com>
Subject: Re: [patch 021/104] lib/idr.c: fix rcu related race with idr_find
On Thu, Dec 4, 2008 at 5:49 AM, Greg KH <gregkh@...e.de> wrote:
> 2.6.27-stable review patch. If anyone has any objections, please let us know.
>
Revert.
This caused problems in the F10 kernel with idr, the drm device alloc
went all wierd,
it might be a drm bug but changing this code triggers it and so it
isn't really "stable"
Dave.
> ------------------
> From: Manfred Spraul <manfred@...orfullife.com>
>
> commit 6ff2d39b91aec3dcae951afa982059e3dd9b49dc upstream.
>
> 2nd part of the fixes needed for
> http://bugzilla.kernel.org/show_bug.cgi?id=11796.
>
> When the idr tree is either grown or shrunk, then the update to the number
> of layers and the top pointer were not atomic. This race caused crashes.
>
> The attached patch fixes that by replicating the layers counter in each
> layer, thus idr_find doesn't need idp->layers anymore.
>
> Signed-off-by: Manfred Spraul <manfred@...orfullife.com>
> Cc: Clement Calmels <cboulte@...il.com>
> Cc: Nadia Derbey <Nadia.Derbey@...l.net>
> Cc: Pierre Peiffer <peifferp@...il.com>
> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
>
> ---
> include/linux/idr.h | 3 ++-
> lib/idr.c | 14 ++++++++++++--
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
> --- a/include/linux/idr.h
> +++ b/include/linux/idr.h
> @@ -52,13 +52,14 @@ struct idr_layer {
> unsigned long bitmap; /* A zero bit means "space here" */
> struct idr_layer *ary[1<<IDR_BITS];
> int count; /* When zero, we can release it */
> + int layer; /* distance from leaf */
> struct rcu_head rcu_head;
> };
>
> struct idr {
> struct idr_layer *top;
> struct idr_layer *id_free;
> - int layers;
> + int layers; /* only valid without concurrent changes */
> int id_free_cnt;
> spinlock_t lock;
> };
> --- a/lib/idr.c
> +++ b/lib/idr.c
> @@ -185,6 +185,7 @@ static int sub_alloc(struct idr *idp, in
> new = get_from_free_list(idp);
> if (!new)
> return -1;
> + new->layer = l-1;
> rcu_assign_pointer(p->ary[m], new);
> p->count++;
> }
> @@ -210,6 +211,7 @@ build_up:
> if (unlikely(!p)) {
> if (!(p = get_from_free_list(idp)))
> return -1;
> + p->layer = 0;
> layers = 1;
> }
> /*
> @@ -237,6 +239,7 @@ build_up:
> }
> new->ary[0] = p;
> new->count = 1;
> + new->layer = layers-1;
> if (p->bitmap == IDR_FULL)
> __set_bit(0, &new->bitmap);
> p = new;
> @@ -493,17 +496,21 @@ void *idr_find(struct idr *idp, int id)
> int n;
> struct idr_layer *p;
>
> - n = idp->layers * IDR_BITS;
> p = rcu_dereference(idp->top);
> + if (!p)
> + return NULL;
> + n = (p->layer+1) * IDR_BITS;
>
> /* Mask off upper bits we don't use for the search. */
> id &= MAX_ID_MASK;
>
> if (id >= (1 << n))
> return NULL;
> + BUG_ON(n == 0);
>
> while (n > 0 && p) {
> n -= IDR_BITS;
> + BUG_ON(n != p->layer*IDR_BITS);
> p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);
> }
> return((void *)p);
> @@ -582,8 +589,11 @@ void *idr_replace(struct idr *idp, void
> int n;
> struct idr_layer *p, *old_p;
>
> - n = idp->layers * IDR_BITS;
> p = idp->top;
> + if (!p)
> + return ERR_PTR(-EINVAL);
> +
> + n = (p->layer+1) * IDR_BITS;
>
> id &= MAX_ID_MASK;
>
>
> --
> 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/
>
--
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