public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
* [PATCH] util: fix confusion between offset in the iovec array and in the entry
@ 2024-03-19 10:13 Laurent Vivier
  2024-03-20  4:27 ` David Gibson
  0 siblings, 1 reply; 3+ messages in thread
From: Laurent Vivier @ 2024-03-19 10:13 UTC (permalink / raw)
  To: passt-dev; +Cc: Laurent Vivier, david

In write_remainder() 'skip' is the offset to start the operation from
in the iovec array.

In iov_skip_bytes(), 'skip' is also the offset in the iovec array but
'offset' is the first unskipped byte in the iovec entry.

As write_remainder() uses 'skip' for both, 'skip' is reset to the
first unskipped byte in the iovec entry rather to staying the first
unskipped byte in the iovec array.

Fix the problem by introducing a new variable not to overwrite 'skip'
on each loop.

Fixes: 8bdb0883b441 ("util: Add write_remainder() helper")
Cc: david@gibson.dropbear.id.au
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 util.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util.c b/util.c
index 3b2393d6bfa8..eee53aed811b 100644
--- a/util.c
+++ b/util.c
@@ -533,13 +533,14 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
 int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip)
 {
 	int i;
+	size_t offset;
 
-	while ((i = iov_skip_bytes(iov, iovcnt, skip, &skip)) < iovcnt) {
+	while ((i = iov_skip_bytes(iov, iovcnt, skip, &offset)) < iovcnt) {
 		ssize_t rc;
 
 		if (skip) {
-			rc = write(fd, (char *)iov[i].iov_base + skip,
-				   iov[i].iov_len - skip);
+			rc = write(fd, (char *)iov[i].iov_base + offset,
+				   iov[i].iov_len - offset);
 		} else {
 			rc = writev(fd, &iov[i], iovcnt - i);
 		}
-- 
@@ -533,13 +533,14 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
 int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip)
 {
 	int i;
+	size_t offset;
 
-	while ((i = iov_skip_bytes(iov, iovcnt, skip, &skip)) < iovcnt) {
+	while ((i = iov_skip_bytes(iov, iovcnt, skip, &offset)) < iovcnt) {
 		ssize_t rc;
 
 		if (skip) {
-			rc = write(fd, (char *)iov[i].iov_base + skip,
-				   iov[i].iov_len - skip);
+			rc = write(fd, (char *)iov[i].iov_base + offset,
+				   iov[i].iov_len - offset);
 		} else {
 			rc = writev(fd, &iov[i], iovcnt - i);
 		}
-- 
2.42.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-03-20  7:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-19 10:13 [PATCH] util: fix confusion between offset in the iovec array and in the entry Laurent Vivier
2024-03-20  4:27 ` David Gibson
2024-03-20  7:02   ` Laurent Vivier

Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).