Merge b5287c55 ("Merge tag 'vfs-6.13.exec.deny_write_access.revert' of...

Merge b5287c55 ("Merge tag 'vfs-6.13.exec.deny_write_access.revert' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	fs/exec.c

Change-Id: I9f97cf812f64ee10d2e3b9ba6e79003125814fe1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

fs/exec.c

@@ -883,8 +883,8 @@ EXPORT_SYMBOL(transfer_args_to_stack);
  */
 static struct file *do_open_execat(int fd, struct filename *name, int flags)
 {
-	struct file *file;
 	int err;
+	struct file *file __free(fput) = NULL;
 	struct open_flags open_exec_flags = {
 		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
 		.acc_mode = MAY_EXEC,
@@ -909,18 +909,14 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
 	 * an invariant that all non-regular files error out before we get here.
 	 */
 	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode)) ||
-	    path_noexec(&file->f_path)) {
-		fput(file);
+	    path_noexec(&file->f_path))
 		return ERR_PTR(-EACCES);
-	}
 
 	err = deny_write_access(file);
-	if (err) {
-		fput(file);
+	if (err)
 		return ERR_PTR(err);
-	}
 
-	return file;
+	return no_free_ptr(file);
 }
 
 /**