diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2007-07-16 02:41:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:47 -0400 |
commit | 467e9f4b5086a60a5cb2e032ccaf4a31abadc4c2 (patch) | |
tree | f21b3975db312e4cdee1d9d3622549de2648b7ff /fs | |
parent | 3e733f071e16bdad13a75eedb102e8941b09927e (diff) |
fix create_new_namespaces() return value
dup_mnt_ns() and clone_uts_ns() return NULL on failure. This is wrong,
create_new_namespaces() uses ERR_PTR() to catch an error. This means that the
subsequent create_new_namespaces() will hit BUG_ON() in copy_mnt_ns() or
copy_utsname().
Modify create_new_namespaces() to also use the errors returned by the
copy_*_ns routines and not to systematically return ENOMEM.
[oleg@tv-sign.ru: better changelog]
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Serge E. Hallyn <serue@us.ibm.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namespace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index c811a94e4c88..5585623f6252 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1451,7 +1451,7 @@ static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns, | |||
1451 | 1451 | ||
1452 | new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL); | 1452 | new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL); |
1453 | if (!new_ns) | 1453 | if (!new_ns) |
1454 | return NULL; | 1454 | return ERR_PTR(-ENOMEM); |
1455 | 1455 | ||
1456 | atomic_set(&new_ns->count, 1); | 1456 | atomic_set(&new_ns->count, 1); |
1457 | INIT_LIST_HEAD(&new_ns->list); | 1457 | INIT_LIST_HEAD(&new_ns->list); |
@@ -1465,7 +1465,7 @@ static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns, | |||
1465 | if (!new_ns->root) { | 1465 | if (!new_ns->root) { |
1466 | up_write(&namespace_sem); | 1466 | up_write(&namespace_sem); |
1467 | kfree(new_ns); | 1467 | kfree(new_ns); |
1468 | return NULL; | 1468 | return ERR_PTR(-ENOMEM);; |
1469 | } | 1469 | } |
1470 | spin_lock(&vfsmount_lock); | 1470 | spin_lock(&vfsmount_lock); |
1471 | list_add_tail(&new_ns->list, &new_ns->root->mnt_list); | 1471 | list_add_tail(&new_ns->list, &new_ns->root->mnt_list); |