Unverified Commit 910c361f authored by Christian Brauner's avatar Christian Brauner
Browse files

secretmem: convert memfd_secret() to FD_ADD() 

Link: https://patch.msgid.link/20251123-work-fd-prepare-v4-26-b6efa1706cfd@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 1afcbbe5

mm/secretmem.c

+1 −19
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ static struct file *secretmem_file_create(unsigned long flags) 


SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)

{

	struct file *file;

	int fd, err;



	/* make sure local flags do not confict with global fcntl.h */

	BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
@@ -238,22 +235,7 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) 
	if (atomic_read(&secretmem_users) < 0)

		return -ENFILE;



	fd = get_unused_fd_flags(flags & O_CLOEXEC);

	if (fd < 0)

		return fd;



	file = secretmem_file_create(flags);

	if (IS_ERR(file)) {

		err = PTR_ERR(file);

		goto err_put_fd;

	}



	fd_install(fd, file);

	return fd;



err_put_fd:

	put_unused_fd(fd);

	return err;

	return FD_ADD(flags & O_CLOEXEC, secretmem_file_create(flags));

}



static int secretmem_init_fs_context(struct fs_context *fc)