From 0f9512bdd21fca5040a8227d1f8a66652e46ef1b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Dec 2020 10:29:33 +0100 Subject: [PATCH] Revert "ANDROID: inode_owner_or_capable called during execv" This reverts commit 710cc7493c34f1622b948ef6f91279c154db61c0 as it causes massive merge issues with 5.11-rc1. If needed, please bring it back. Cc: Mark Salyzyn Cc: John Stultz Bug: 169988379 Signed-off-by: Greg Kroah-Hartman Change-Id: I24d2a761c537d845cfaabcc89af3a5775ff6a94b --- fs/overlayfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 83d95fb384ed..660b1629c7c8 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -53,7 +53,7 @@ static struct file *ovl_open_realfile(const struct file *file, err = inode_permission(realinode, MAY_OPEN | acc_mode); if (err) { realfile = ERR_PTR(err); - } else if (old_cred && !inode_owner_or_capable(realinode)) { + } else if (!inode_owner_or_capable(realinode)) { realfile = ERR_PTR(-EPERM); } else { realfile = open_with_fake_path(&file->f_path, flags, realinode,