Received-SPF: pass (google.com: domain of linux-kernel+bounces-140849-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 087/437] tomoyo: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:13:47 -0600
Message-ID: <20240411153126.16201-88-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>
---
 security/tomoyo/securityfs_if.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c
index a2705798476f..49421d5377f7 100644
--- a/security/tomoyo/securityfs_if.c
+++ b/security/tomoyo/securityfs_if.c
@@ -86,6 +86,7 @@ static ssize_t tomoyo_write_self(struct file *file, const char __user *buf,
 	kfree(data);
 	return error ? error : count;
 }
+FOPS_WRITE_ITER_HELPER(tomoyo_write_self);
 
 /**
  * tomoyo_read_self - read() for /sys/kernel/security/tomoyo/self_domain interface.
@@ -97,28 +98,28 @@ static ssize_t tomoyo_write_self(struct file *file, const char __user *buf,
  *
  * Returns read size on success, negative value otherwise.
  */
-static ssize_t tomoyo_read_self(struct file *file, char __user *buf,
-				size_t count, loff_t *ppos)
+static ssize_t tomoyo_read_self(struct kiocb *iocb, struct iov_iter *to)
 {
 	const char *domain = tomoyo_domain()->domainname->name;
+	size_t count = iov_iter_count(to);
 	loff_t len = strlen(domain);
-	loff_t pos = *ppos;
+	loff_t pos = iocb->ki_pos;
 
 	if (pos >= len || !count)
 		return 0;
 	len -= pos;
 	if (count < len)
 		len = count;
-	if (copy_to_user(buf, domain + pos, len))
+	if (copy_to_iter(domain + pos, len, to))
 		return -EFAULT;
-	*ppos += len;
+	iocb->ki_pos += len;
 	return len;
 }
 
 /* Operations for /sys/kernel/security/tomoyo/self_domain interface. */
 static const struct file_operations tomoyo_self_operations = {
-	.write = tomoyo_write_self,
-	.read  = tomoyo_read_self,
+	.write_iter = tomoyo_write_self_iter,
+	.read_iter  = tomoyo_read_self,
 };
 
 /**
@@ -178,6 +179,7 @@ static ssize_t tomoyo_read(struct file *file, char __user *buf, size_t count,
 {
 	return tomoyo_read_control(file->private_data, buf, count);
 }
+FOPS_READ_ITER_HELPER(tomoyo_read);
 
 /**
  * tomoyo_write - write() for /sys/kernel/security/tomoyo/ interface.
@@ -194,6 +196,7 @@ static ssize_t tomoyo_write(struct file *file, const char __user *buf,
 {
 	return tomoyo_write_control(file->private_data, buf, count);
 }
+FOPS_WRITE_ITER_HELPER(tomoyo_write);
 
 /*
  * tomoyo_operations is a "struct file_operations" which is used for handling
@@ -206,8 +209,8 @@ static const struct file_operations tomoyo_operations = {
 	.open    = tomoyo_open,
 	.release = tomoyo_release,
 	.poll    = tomoyo_poll,
-	.read    = tomoyo_read,
-	.write   = tomoyo_write,
+	.read_iter = tomoyo_read_iter,
+	.write_iter = tomoyo_write_iter,
 	.llseek  = noop_llseek,
 };
 
-- 
2.43.0