diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-04-25 03:31:02 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-05-14 15:51:42 +0200 |
| commit | e919328810bca2ea3f7a224a34cbccd7baf826d5 (patch) | |
| tree | 7bb4f42743564fbfbd5b79281952b5eb1643998a | |
| parent | make xattr_getsecurity() static (diff) | |
| download | linux-e919328810bca2ea3f7a224a34cbccd7baf826d5.tar.xz linux-e919328810bca2ea3f7a224a34cbccd7baf826d5.zip | |
__inode_security_revalidate() never gets NULL opt_dentry
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | security/selinux/hooks.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4cafe6a19167..b02315183b2f 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -274,11 +274,10 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent * Try reloading inode security labels that have been marked as invalid. The * @may_sleep parameter indicates when sleeping and thus reloading labels is * allowed; when set to false, returns -ECHILD when the label is - * invalid. The @opt_dentry parameter should be set to a dentry of the inode; - * when no dentry is available, set it to NULL instead. + * invalid. The @dentry parameter should be set to a dentry of the inode. */ static int __inode_security_revalidate(struct inode *inode, - struct dentry *opt_dentry, + struct dentry *dentry, bool may_sleep) { struct inode_security_struct *isec = inode->i_security; @@ -295,7 +294,7 @@ static int __inode_security_revalidate(struct inode *inode, * @opt_dentry is NULL and no dentry for this inode can be * found; in that case, continue using the old label. */ - inode_doinit_with_dentry(inode, opt_dentry); + inode_doinit_with_dentry(inode, dentry); } return 0; } |