Received-SPF: pass (google.com: domain of linux-kernel+bounces-140878-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 114/437] fs/efivars: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:14:14 -0600
Message-ID: <20240411153126.16201-115-axboe@kernel.dk>
In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk>
References: <20240411153126.16201-1-axboe@kernel.dk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 fs/efivarfs/file.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c
index 7e9961639802..b53246e728a5 100644
--- a/fs/efivarfs/file.c
+++ b/fs/efivarfs/file.c
@@ -12,13 +12,13 @@
 
 #include "internal.h"
 
-static ssize_t efivarfs_file_write(struct file *file,
-		const char __user *userbuf, size_t count, loff_t *ppos)
+static ssize_t efivarfs_file_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	struct efivar_entry *var = file->private_data;
+	struct efivar_entry *var = iocb->ki_filp->private_data;
+	size_t count = iov_iter_count(from);
 	void *data;
 	u32 attributes;
-	struct inode *inode = file->f_mapping->host;
+	struct inode *inode = iocb->ki_filp->f_mapping->host;
 	unsigned long datasize = count - sizeof(attributes);
 	ssize_t bytes;
 	bool set = false;
@@ -26,13 +26,13 @@ static ssize_t efivarfs_file_write(struct file *file,
 	if (count < sizeof(attributes))
 		return -EINVAL;
 
-	if (copy_from_user(&attributes, userbuf, sizeof(attributes)))
+	if (!copy_from_iter_full(&attributes, sizeof(attributes), from))
 		return -EFAULT;
 
 	if (attributes & ~(EFI_VARIABLE_MASK))
 		return -EINVAL;
 
-	data = memdup_user(userbuf + sizeof(attributes), datasize);
+	data = iterdup(from, datasize);
 	if (IS_ERR(data))
 		return PTR_ERR(data);
 
@@ -46,8 +46,8 @@ static ssize_t efivarfs_file_write(struct file *file,
 
 	if (bytes == -ENOENT) {
 		drop_nlink(inode);
-		d_delete(file->f_path.dentry);
-		dput(file->f_path.dentry);
+		d_delete(iocb->ki_filp->f_path.dentry);
+		dput(iocb->ki_filp->f_path.dentry);
 	} else {
 		inode_lock(inode);
 		i_size_write(inode, datasize + sizeof(attributes));
@@ -63,17 +63,16 @@ static ssize_t efivarfs_file_write(struct file *file,
 	return bytes;
 }
 
-static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
-		size_t count, loff_t *ppos)
+static ssize_t efivarfs_file_read(struct kiocb *iocb, struct iov_iter *to)
 {
-	struct efivar_entry *var = file->private_data;
+	struct efivar_entry *var = iocb->ki_filp->private_data;
 	unsigned long datasize = 0;
 	u32 attributes;
 	void *data;
 	ssize_t size = 0;
 	int err;
 
-	while (!__ratelimit(&file->f_cred->user->ratelimit))
+	while (!__ratelimit(&iocb->ki_filp->f_cred->user->ratelimit))
 		msleep(50);
 
 	err = efivar_entry_size(var, &datasize);
@@ -98,8 +97,8 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
 		goto out_free;
 
 	memcpy(data, &attributes, sizeof(attributes));
-	size = simple_read_from_buffer(userbuf, count, ppos,
-				       data, datasize + sizeof(attributes));
+	size = simple_copy_to_iter(data, &iocb->ki_pos,
+				   datasize + sizeof(attributes), to);
 out_free:
 	kfree(data);
 
@@ -108,7 +107,7 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
 
 const struct file_operations efivarfs_file_operations = {
 	.open	= simple_open,
-	.read	= efivarfs_file_read,
-	.write	= efivarfs_file_write,
+	.read_iter	= efivarfs_file_read,
+	.write_iter	= efivarfs_file_write,
 	.llseek	= no_llseek,
 };
-- 
2.43.0