From 8e1bb022dd4493cb30d549694e04103a855ae03e Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 5 Oct 2020 05:24:21 -0700 Subject: [PATCH] ANDROID: overlayfs: readdir override_creds=off option bypass creator_cred ovl_revert_creds calls missing. Addendum to commit 6120a4d78045cc741f04ed6bcd3d6f553115278d ("FROMLIST: overlayfs: override_creds=off option bypass creator_cred") Signed-off-by: Mark Salyzyn Bug: 169988379 Fixes: 48bd024b8a40 ("ovl: switch to mounter creds in readdir") Change-Id: Ib351a453cca7fb5a2d87c60212f4ab0a420deb98 --- fs/overlayfs/readdir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index c41cfc7ab263..237793f0c430 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -795,7 +795,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx) } err = 0; out: - revert_creds(old_cred); + ovl_revert_creds(dentry->d_sb, old_cred); return err; } @@ -847,7 +847,7 @@ static struct file *ovl_dir_open_realfile(struct file *file, old_cred = ovl_override_creds(file_inode(file)->i_sb); res = ovl_path_open(realpath, O_RDONLY | (file->f_flags & O_LARGEFILE)); - revert_creds(old_cred); + ovl_revert_creds(file_inode(file)->i_sb, old_cred); return res; }