diff options
author | Christoph Lameter <cl@linux.com> | 2012-01-17 10:27:31 -0500 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-02-06 05:24:13 -0500 |
commit | 66c4c35c6bc5a1a452b024cf0364635b28fd94e4 (patch) | |
tree | 75fa5528d28fdedde489e4d9ebc4a961aeecd6f0 /mm | |
parent | 0ad9500e16fe24aa55809a2b00e0d2d0e658fc71 (diff) |
slub: Do not hold slub_lock when calling sysfs_slab_add()
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.
Cc: <stable@vger.kernel.org> # 3.3+
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slub.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3937,13 +3937,14 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, | |||
3937 | if (kmem_cache_open(s, n, | 3937 | if (kmem_cache_open(s, n, |
3938 | size, align, flags, ctor)) { | 3938 | size, align, flags, ctor)) { |
3939 | list_add(&s->list, &slab_caches); | 3939 | list_add(&s->list, &slab_caches); |
3940 | up_write(&slub_lock); | ||
3940 | if (sysfs_slab_add(s)) { | 3941 | if (sysfs_slab_add(s)) { |
3942 | down_write(&slub_lock); | ||
3941 | list_del(&s->list); | 3943 | list_del(&s->list); |
3942 | kfree(n); | 3944 | kfree(n); |
3943 | kfree(s); | 3945 | kfree(s); |
3944 | goto err; | 3946 | goto err; |
3945 | } | 3947 | } |
3946 | up_write(&slub_lock); | ||
3947 | return s; | 3948 | return s; |
3948 | } | 3949 | } |
3949 | kfree(n); | 3950 | kfree(n); |