Messages in this thread Patch in this message | | | Date | Mon, 21 Jul 2008 12:42:59 +0400 | From | Cyrill Gorcunov <> | Subject | Re: [PATCH] vfs: use kstrdup() |
| |
[Al Viro - Mon, Jul 21, 2008 at 09:28:57AM +0100] | On Mon, Jul 21, 2008 at 12:04:27PM +0400, Cyrill Gorcunov wrote: | > err = mnt_alloc_id(mnt); | > - if (err) { | > - kmem_cache_free(mnt_cache, mnt); | > - return NULL; | > + if (err) | > + goto err; | | Ugh... Labels are in a separate namespace, but really... | | > + if (name) { | > + mnt->mnt_devname = kstrdup(name, GFP_KERNEL); | > + if (!mnt->mnt_devname) | > + goto err; | | > +err: | > + kmem_cache_free(mnt_cache, mnt); | > + return NULL; | | Leak; note the mnt_alloc_id() above. Either do that kstrdup() first and | kfree the result on mnt_alloc_id() failure or do mnt_free_id() on kstrdup() | one... |
ok, here is an update version. labels names could be not that good choosen (check please).
- Cyrill - ---
Index: linux-2.6.git/fs/namespace.c =================================================================== --- linux-2.6.git.orig/fs/namespace.c 2008-07-21 11:34:37.000000000 +0400 +++ linux-2.6.git/fs/namespace.c 2008-07-21 12:40:12.000000000 +0400 @@ -112,9 +112,13 @@ struct vfsmount *alloc_vfsmnt(const char int err; err = mnt_alloc_id(mnt); - if (err) { - kmem_cache_free(mnt_cache, mnt); - return NULL; + if (err) + goto out_free_cache; + + if (name) { + mnt->mnt_devname = kstrdup(name, GFP_KERNEL); + if (!mnt->mnt_devname) + goto out_free_id; } atomic_set(&mnt->mnt_count, 1); @@ -127,16 +131,14 @@ struct vfsmount *alloc_vfsmnt(const char INIT_LIST_HEAD(&mnt->mnt_slave_list); INIT_LIST_HEAD(&mnt->mnt_slave); atomic_set(&mnt->__mnt_writers, 0); - if (name) { - int size = strlen(name) + 1; - char *newname = kmalloc(size, GFP_KERNEL); - if (newname) { - memcpy(newname, name, size); - mnt->mnt_devname = newname; - } - } } return mnt; + +out_free_id: + mnt_free_id(mnt); +out_free_cache: + kmem_cache_free(mnt_cache, mnt); + return NULL; } /*
| |