lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] spufs: dont leak directories in failed spu_create

Browse Source 
If get_unused_fd failed in sys_spu_create, we never cleaned
up the created directory. Fix that by restructuring the
error path.

Noticed by Al Viro.

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Arnd Bergmann
2006-01-04 20:31:26 +01:00
committed by Paul Mackerras
parent 0106246594
commit 346f4d3ce9
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
arch/powerpc/platforms/cell/spufs/inode.c
View File

@@ -26,6 +26,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mount.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/poll.h> #include <linux/poll.h>
@@ -251,6 +252,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
dget(dentry); dget(dentry);
dir->i_nlink++; dir->i_nlink++;
dentry->d_inode->i_nlink++;
goto out; goto out;
out_free_ctx: out_free_ctx:
@@ -261,18 +263,44 @@ out:
return ret; return ret;
} }
static int spufs_context_open(struct dentry *dentry, struct vfsmount *mnt)
{
int ret;
struct file *filp;
ret = get_unused_fd();
if (ret < 0) {
dput(dentry);
mntput(mnt);
goto out;
}
filp = dentry_open(dentry, mnt, O_RDONLY);
if (IS_ERR(filp)) {
put_unused_fd(ret);
ret = PTR_ERR(filp);
goto out;
}
filp->f_op = &spufs_context_fops;
fd_install(ret, filp);
out:
return ret;
}
static struct file_system_type spufs_type;
long long
spufs_create_thread(struct nameidata *nd, const char *name, spufs_create_thread(struct nameidata *nd, const char *name,
unsigned int flags, mode_t mode) unsigned int flags, mode_t mode)
{ {
struct dentry *dentry; struct dentry *dentry;
struct file *filp;
int ret; int ret;
/* need to be at the root of spufs */ /* need to be at the root of spufs */
ret = -EINVAL; ret = -EINVAL;
if (nd->dentry->d_sb->s_magic != SPUFS_MAGIC || if (nd->dentry->d_sb->s_type != &spufs_type ||
nd->dentry != nd->dentry->d_sb->s_root) nd->dentry != nd->dentry->d_sb->s_root)
goto out; goto out;
dentry = lookup_create(nd, 1); dentry = lookup_create(nd, 1);
@@ -289,21 +317,13 @@ spufs_create_thread(struct nameidata *nd, const char *name,
if (ret) if (ret)
goto out_dput; goto out_dput;
ret = get_unused_fd(); /*
* get references for dget and mntget, will be released
* in error path of *_open().
*/
ret = spufs_context_open(dget(dentry), mntget(nd->mnt));
if (ret < 0) if (ret < 0)
goto out_dput; spufs_rmdir(nd->dentry->d_inode, dentry);
dentry->d_inode->i_nlink++;
filp = filp_open(name, O_RDONLY, mode);
if (IS_ERR(filp)) {
// FIXME: remove directory again
put_unused_fd(ret);
ret = PTR_ERR(filp);
} else {
filp->f_op = &spufs_context_fops;
fd_install(ret, filp);
}
out_dput: out_dput:
dput(dentry); dput(dentry);