mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
BACKPORT: FROMGIT: [PATCH] __inode_security_revalidate() never gets NULL opt_dentry
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
This commit is contained in:
parent
d6f7311cf5
commit
81e41861bf
@ -272,11 +272,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;
|
||||
@ -293,7 +292,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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user