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

Commit 8802565b authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

Smack: Use d_is_positive() rather than testing dentry->d_inode 



Use d_is_positive() rather than testing dentry->d_inode in Smack to get rid of
direct references to d_inode outside of the VFS.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e656a8eb

security/smack/smack_lsm.c

+2 −2
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static int smack_inode_link(struct dentry *old_dentry, struct inode *dir, 
	rc = smk_curacc(isp, MAY_WRITE, &ad);

	rc = smk_bu_inode(old_dentry->d_inode, MAY_WRITE, rc);



	if (rc == 0 && new_dentry->d_inode != NULL) {

	if (rc == 0 && d_is_positive(new_dentry)) {

		isp = smk_of_inode(new_dentry->d_inode);

		smk_ad_setfield_u_fs_path_dentry(&ad, new_dentry);

		rc = smk_curacc(isp, MAY_WRITE, &ad);
@@ -961,7 +961,7 @@ static int smack_inode_rename(struct inode *old_inode, 
	rc = smk_curacc(isp, MAY_READWRITE, &ad);

	rc = smk_bu_inode(old_dentry->d_inode, MAY_READWRITE, rc);



	if (rc == 0 && new_dentry->d_inode != NULL) {

	if (rc == 0 && d_is_positive(new_dentry)) {

		isp = smk_of_inode(new_dentry->d_inode);

		smk_ad_setfield_u_fs_path_dentry(&ad, new_dentry);

		rc = smk_curacc(isp, MAY_READWRITE, &ad);