Linux kernel -stable discussions
 help / color / mirror / Atom feed
* Patch "slub: Do not hold slub_lock when calling sysfs_slab_add()" has been added to the 3.0-stable tree
@ 2012-03-29 16:03 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2012-03-29 16:03 UTC (permalink / raw)
  To: cl, eric.dumazet, gregkh, levinsasha928, penberg; +Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    slub: Do not hold slub_lock when calling sysfs_slab_add()

to the 3.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     slub-do-not-hold-slub_lock-when-calling-sysfs_slab_add.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 66c4c35c6bc5a1a452b024cf0364635b28fd94e4 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Tue, 17 Jan 2012 09:27:31 -0600
Subject: slub: Do not hold slub_lock when calling sysfs_slab_add()

From: Christoph Lameter <cl@linux.com>

commit 66c4c35c6bc5a1a452b024cf0364635b28fd94e4 upstream.

sysfs_slab_add() calls various sysfs functions that actually may
end up in userspace doing all sorts of things.

Release the slub_lock after adding the kmem_cache structure to the list.
At that point the address of the kmem_cache is not known so we are
guaranteed exlusive access to the following modifications to the
kmem_cache structure.

If the sysfs_slab_add fails then reacquire the slub_lock to
remove the kmem_cache structure from the list.

Reported-by: Sasha Levin <levinsasha928@gmail.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 mm/slub.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3439,13 +3439,14 @@ struct kmem_cache *kmem_cache_create(con
 		if (kmem_cache_open(s, n,
 				size, align, flags, ctor)) {
 			list_add(&s->list, &slab_caches);
+			up_write(&slub_lock);
 			if (sysfs_slab_add(s)) {
+				down_write(&slub_lock);
 				list_del(&s->list);
 				kfree(n);
 				kfree(s);
 				goto err;
 			}
-			up_write(&slub_lock);
 			return s;
 		}
 		kfree(n);


Patches currently in stable-queue which might be from cl@linux.com are

queue-3.0/slub-do-not-hold-slub_lock-when-calling-sysfs_slab_add.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-03-29 16:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-29 16:03 Patch "slub: Do not hold slub_lock when calling sysfs_slab_add()" has been added to the 3.0-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox