From bf599fdbefd60cff94841318de0419ec01476655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 3 Aug 2023 16:53:59 +0200
Subject: [PATCH] memfd: make memfd_open() skip fd attributes not needed for
 vma mapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is only one user of memfd_open() outside of memfd.c: open_filemap().
It is restoring a file-backed mapping and doesn't need to F_SETOWN
nor update the fd's position.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/memfd.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 2158b67206..1a9674f82e 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -338,7 +338,7 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 
 	fd = memfd_open_inode(mfi->inode);
 	if (fd < 0)
-		goto err;
+		return -1;
 
 	/* Reopen the fd with original permissions */
 	flags = fdflags ? *fdflags : mfe->flags;
@@ -348,40 +348,40 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	 * important though.
 	 */
 	_fd = __open_proc(PROC_SELF, 0, flags, "fd/%d", fd);
-	if (_fd < 0) {
+	if (_fd < 0)
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
-		goto err;
-	}
+
 	close(fd);
-	fd = _fd;
+	return _fd;
+}
+
+static int memfd_open_fe_fd(struct file_desc *d, int *new_fd)
+{
+	MemfdFileEntry *mfe;
+	int fd;
+
+	fd = memfd_open(d, NULL);
+	if (fd < 0)
+		return -1;
+
+	mfe = container_of(d, struct memfd_info, d)->mfe;
 
 	if (restore_fown(fd, mfe->fown) < 0)
 		goto err;
 
 	if (lseek(fd, mfe->pos, SEEK_SET) < 0) {
-		pr_perror("Can't restore file position of memfd id=%d", mfe->id);
+		pr_perror("Can't restore file position of %d for memfd id=%d", fd, mfe->id);
 		goto err;
 	}
 
-	return fd;
+	*new_fd = fd;
+	return 0;
 
 err:
-	if (fd >= 0)
-		close(fd);
+	close(fd);
 	return -1;
 }
 
-static int memfd_open_fe_fd(struct file_desc *fd, int *new_fd)
-{
-	int tmp;
-
-	tmp = memfd_open(fd, NULL);
-	if (tmp < 0)
-		return -1;
-	*new_fd = tmp;
-	return 0;
-}
-
 static char *memfd_d_name(struct file_desc *d, char *buf, size_t s)
 {
 	MemfdInodeEntry *mie = NULL;