Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad4eb32c authored by Roberto Sassu's avatar Roberto Sassu Committed by Greg Kroah-Hartman
Browse files

reiserfs: Add missing calls to reiserfs_security_free() 



commit 572302af1258459e124437b8f3369357447afac7 upstream.

Commit 57fe60df ("reiserfs: add atomic addition of selinux attributes
during inode creation") defined reiserfs_security_free() to free the name
and value of a security xattr allocated by the active LSM through
security_old_inode_init_security(). However, this function is not called
in the reiserfs code.

Thus, add a call to reiserfs_security_free() whenever
reiserfs_security_init() is called, and initialize value to NULL, to avoid
to call kfree() on an uninitialized pointer.

Finally, remove the kfree() for the xattr name, as it is not allocated
anymore.

Fixes: 57fe60df ("reiserfs: add atomic addition of selinux attributes during inode creation")
Cc: stable@vger.kernel.org
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Reported-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a5ef188

fs/reiserfs/namei.c

+4 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod 


out_failed:

	reiserfs_write_unlock(dir->i_sb);

	reiserfs_security_free(&security);

	return retval;

}
@@ -778,6 +779,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode 


out_failed:

	reiserfs_write_unlock(dir->i_sb);

	reiserfs_security_free(&security);

	return retval;

}
@@ -876,6 +878,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode 
	retval = journal_end(&th);

out_failed:

	reiserfs_write_unlock(dir->i_sb);

	reiserfs_security_free(&security);

	return retval;

}
@@ -1191,6 +1194,7 @@ static int reiserfs_symlink(struct inode *parent_dir, 
	retval = journal_end(&th);

out_failed:

	reiserfs_write_unlock(parent_dir->i_sb);

	reiserfs_security_free(&security);

	return retval;

}

fs/reiserfs/xattr_security.c

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode, 
	int error;



	sec->name = NULL;

	sec->value = NULL;



	/* Don't add selinux attributes on xattrs - they'll never get used */

	if (IS_PRIVATE(dir))
@@ -94,7 +95,6 @@ int reiserfs_security_write(struct reiserfs_transaction_handle *th, 


void reiserfs_security_free(struct reiserfs_security_handle *sec)

{

	kfree(sec->name);

	kfree(sec->value);

	sec->name = NULL;

	sec->value = NULL;