mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[PATCH] fix up new filp allocators
Some new uses of get_empty_filp() have crept in; switched to alloc_file() to make sure that pieces of initialization won't be missing. We really need to kill get_empty_filp(). [AV] fixed dentry leak on failure exit in anon_inode_getfd() Cc: Erez Zadok <[email protected]> Cc: Trond Myklebust <[email protected]> Cc: "J Bruce Fields" <[email protected]> Acked-by: Al Viro <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
322ee5b36e
commit
430e285e08
3 changed files with 23 additions and 20 deletions
19
fs/pipe.c
19
fs/pipe.c
|
|
@ -957,13 +957,10 @@ struct file *create_write_pipe(void)
|
|||
struct dentry *dentry;
|
||||
struct qstr name = { .name = "" };
|
||||
|
||||
f = get_empty_filp();
|
||||
if (!f)
|
||||
return ERR_PTR(-ENFILE);
|
||||
err = -ENFILE;
|
||||
inode = get_pipe_inode();
|
||||
if (!inode)
|
||||
goto err_file;
|
||||
goto err;
|
||||
|
||||
err = -ENOMEM;
|
||||
dentry = d_alloc(pipe_mnt->mnt_sb->s_root, &name);
|
||||
|
|
@ -978,22 +975,24 @@ struct file *create_write_pipe(void)
|
|||
*/
|
||||
dentry->d_flags &= ~DCACHE_UNHASHED;
|
||||
d_instantiate(dentry, inode);
|
||||
f->f_path.mnt = mntget(pipe_mnt);
|
||||
f->f_path.dentry = dentry;
|
||||
|
||||
err = -ENFILE;
|
||||
f = alloc_file(pipe_mnt, dentry, FMODE_WRITE, &write_pipe_fops);
|
||||
if (!f)
|
||||
goto err_dentry;
|
||||
f->f_mapping = inode->i_mapping;
|
||||
|
||||
f->f_flags = O_WRONLY;
|
||||
f->f_op = &write_pipe_fops;
|
||||
f->f_mode = FMODE_WRITE;
|
||||
f->f_version = 0;
|
||||
|
||||
return f;
|
||||
|
||||
err_dentry:
|
||||
dput(dentry);
|
||||
err_inode:
|
||||
free_pipe_info(inode);
|
||||
iput(inode);
|
||||
err_file:
|
||||
put_filp(f);
|
||||
err:
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue