dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

CAPI: Fix leaks in capifs_new_ncci 

When something went wrong during capifs_new_ncci, the looked up dentry
was not properly released. Neither was the allocated inode. Refactor the
function to avoid leaks.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Kiszka 2010-02-08 10:12:05 +00:00 committed by David S. Miller
parent 54716e3beb
commit c947862f91
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/isdn/capi/capifs.c
View File

@ -152,22 +152,33 @@ static struct dentry *get_node(int num)
void capifs_new_ncci(unsigned int number, dev_t device)
{
struct dentry *dentry;
struct inode *inode = new_inode(capifs_mnt->mnt_sb);
if (!inode)
return;
inode->i_ino = number+2;
struct inode *inode;
dentry = get_node(number);
if (IS_ERR(dentry))
goto unlock_out;
if (dentry->d_inode) {
dput(dentry);
goto unlock_out;
}
inode = new_inode(capifs_mnt->mnt_sb);
if (!inode) {
dput(dentry);
goto unlock_out;
}
/* config contents is protected by root's i_mutex */
inode->i_uid = config.setuid ? config.uid : current_fsuid();
inode->i_gid = config.setgid ? config.gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
inode->i_ino = number + 2;
init_special_inode(inode, S_IFCHR|config.mode, device);
//inode->i_op = &capifs_file_inode_operations;
if (!IS_ERR(dentry) && !dentry->d_inode)
d_instantiate(dentry, inode);
d_instantiate(dentry, inode);
unlock_out:
mutex_unlock(&capifs_root->d_inode->i_mutex);
}