Commit 7e4237fa authored by nixiaoming's avatar nixiaoming Committed by Paul Moore
Browse files

selinux: cleanup dentry and inodes on error in selinuxfs 



If the resource requested by d_alloc_name is not added to the linked
list through d_add, then dput needs to be called to release the
subsequent abnormal branch to avoid resource leakage.

Add missing dput to selinuxfs.c

Signed-off-by: default avatarnixiaoming <nixiaoming@huawei.com>
[PM: tweak the subject line]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 631d2b49

security/selinux/selinuxfs.c

+25 −8
Original line number Diff line number Diff line
@@ -1377,13 +1377,18 @@ static int sel_make_bools(struct selinux_fs_info *fsi) 


		ret = -ENOMEM;

		inode = sel_make_inode(dir->d_sb, S_IFREG | S_IRUGO | S_IWUSR);

		if (!inode)

		if (!inode) {

			dput(dentry);

			goto out;

		}



		ret = -ENAMETOOLONG;

		len = snprintf(page, PAGE_SIZE, "/%s/%s", BOOL_DIR_NAME, names[i]);

		if (len >= PAGE_SIZE)

		if (len >= PAGE_SIZE) {

			dput(dentry);

			iput(inode);

			goto out;

		}



		isec = (struct inode_security_struct *)inode->i_security;

		ret = security_genfs_sid(fsi->state, "selinuxfs", page,
@@ -1598,8 +1603,10 @@ static int sel_make_avc_files(struct dentry *dir) 
			return -ENOMEM;



		inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode);

		if (!inode)

		if (!inode) {

			dput(dentry);

			return -ENOMEM;

		}



		inode->i_fop = files[i].ops;

		inode->i_ino = ++fsi->last_ino;
@@ -1644,8 +1651,10 @@ static int sel_make_initcon_files(struct dentry *dir) 
			return -ENOMEM;



		inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);

		if (!inode)

		if (!inode) {

			dput(dentry);

			return -ENOMEM;

		}



		inode->i_fop = &sel_initcon_ops;

		inode->i_ino = i|SEL_INITCON_INO_OFFSET;
@@ -1745,8 +1754,10 @@ static int sel_make_perm_files(char *objclass, int classvalue, 


		rc = -ENOMEM;

		inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);

		if (!inode)

		if (!inode) {

			dput(dentry);

			goto out;

		}



		inode->i_fop = &sel_perm_ops;

		/* i+1 since perm values are 1-indexed */
@@ -1775,8 +1786,10 @@ static int sel_make_class_dir_entries(char *classname, int index, 
		return -ENOMEM;



	inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);

	if (!inode)

	if (!inode) {

		dput(dentry);

		return -ENOMEM;

	}



	inode->i_fop = &sel_class_ops;

	inode->i_ino = sel_class_to_ino(index);
@@ -1850,8 +1863,10 @@ static int sel_make_policycap(struct selinux_fs_info *fsi) 
			return -ENOMEM;



		inode = sel_make_inode(fsi->sb, S_IFREG | 0444);

		if (inode == NULL)

		if (inode == NULL) {

			dput(dentry);

			return -ENOMEM;

		}



		inode->i_fop = &sel_policycap_ops;

		inode->i_ino = iter | SEL_POLICYCAP_INO_OFFSET;
@@ -1944,8 +1959,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent) 


	ret = -ENOMEM;

	inode = sel_make_inode(sb, S_IFCHR | S_IRUGO | S_IWUGO);

	if (!inode)

	if (!inode) {

		dput(dentry);

		goto err;

	}



	inode->i_ino = ++fsi->last_ino;

	isec = (struct inode_security_struct *)inode->i_security;

CRA Git | Maintained and supported by SUSTech CRA and CCSE