qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [PULL 08/13] vvfat: Fix bug in writing to middle of file
Date: Mon,  5 Aug 2024 23:08:46 +0200	[thread overview]
Message-ID: <20240805210851.314076-9-kwolf@redhat.com> (raw)
In-Reply-To: <20240805210851.314076-1-kwolf@redhat.com>

From: Amjad Alsharafi <amjadsharafi10@gmail.com>

Before this commit, the behavior when calling `commit_one_file` for
example with `offset=0x2000` (second cluster), what will happen is that
we won't fetch the next cluster from the fat, and instead use the first
cluster for the read operation.

This is due to off-by-one error here, where `i=0x2000 !< offset=0x2000`,
thus not fetching the next cluster.

Signed-off-by: Amjad Alsharafi <amjadsharafi10@gmail.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Tested-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <b97c1e1f1bc2f776061ae914f95d799d124fcd73.1721470238.git.amjadsharafi10@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vvfat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index 086fedf474..a67cfa823b 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2525,8 +2525,9 @@ commit_one_file(BDRVVVFATState* s, int dir_index, uint32_t offset)
         return -1;
     }
 
-    for (i = s->cluster_size; i < offset; i += s->cluster_size)
+    for (i = 0; i < offset; i += s->cluster_size) {
         c = modified_fat_get(s, c);
+    }
 
     fd = qemu_open_old(mapping->path, O_RDWR | O_CREAT | O_BINARY, 0666);
     if (fd < 0) {
-- 
2.45.2



  parent reply	other threads:[~2024-08-05 21:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-05 21:08 [PULL 00/13] Block layer patches Kevin Wolf
2024-08-05 21:08 ` [PULL 01/13] qapi-block-core: Clean up blockdev-snapshot-internal-sync doc Kevin Wolf
2024-08-05 21:08 ` [PULL 02/13] block-copy: Fix missing graph lock Kevin Wolf
2024-08-05 21:08 ` [PULL 03/13] block/graph-lock: Make WITH_GRAPH_RDLOCK_GUARD() fully checked Kevin Wolf
2024-08-05 21:08 ` [PULL 04/13] scsi-disk: Use positive return value for status in dma_readv/writev Kevin Wolf
2024-08-05 21:08 ` [PULL 05/13] scsi-block: Don't skip callback for sgio error status/driver_status Kevin Wolf
2024-08-05 21:08 ` [PULL 06/13] scsi-disk: Add warning comments that host_status errors take a shortcut Kevin Wolf
2024-08-05 21:08 ` [PULL 07/13] scsi-disk: Always report RESERVATION_CONFLICT to guest Kevin Wolf
2024-08-05 21:08 ` Kevin Wolf [this message]
2024-08-05 21:08 ` [PULL 09/13] vvfat: Fix usage of `info.file.offset` Kevin Wolf
2024-08-05 21:08 ` [PULL 10/13] vvfat: Fix wrong checks for cluster mappings invariant Kevin Wolf
2024-08-05 21:08 ` [PULL 11/13] vvfat: Fix reading files with non-continuous clusters Kevin Wolf
2024-08-05 21:08 ` [PULL 12/13] iotests: Add `vvfat` tests Kevin Wolf
2024-08-05 21:08 ` [PULL 13/13] iotests/024: exclude 'backing file format' field from the output Kevin Wolf
2024-08-06  7:32 ` [PULL 00/13] Block layer patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240805210851.314076-9-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).