[PATCH] pNFS: Fix disk addr range check in block/scsi layout

Sergey Bashirov posted 1 patch 3 months, 1 week ago
fs/nfs/blocklayout/blocklayout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] pNFS: Fix disk addr range check in block/scsi layout
Posted by Sergey Bashirov 3 months, 1 week ago
At the end of the isect translation, disc_addr represents the physical
disk offset. Thus, end calculated from disk_addr is also a physical disk
offset. Therefore, range checking should be done using map->disk_offset,
not map->start.

Signed-off-by: Sergey Bashirov <sergeybashirov@gmail.com>
---
 fs/nfs/blocklayout/blocklayout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 47189476b553..5d6edafbed20 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -149,8 +149,8 @@ do_add_page_to_bio(struct bio *bio, int npg, enum req_op op, sector_t isect,
 
 	/* limit length to what the device mapping allows */
 	end = disk_addr + *len;
-	if (end >= map->start + map->len)
-		*len = map->start + map->len - disk_addr;
+	if (end >= map->disk_offset + map->len)
+		*len = map->disk_offset + map->len - disk_addr;
 
 retry:
 	if (!bio) {
-- 
2.43.0
Re: [PATCH] pNFS: Fix disk addr range check in block/scsi layout
Posted by Christoph Hellwig 3 months ago
On Wed, Jul 02, 2025 at 04:32:21PM +0300, Sergey Bashirov wrote:
> At the end of the isect translation, disc_addr represents the physical
> disk offset. Thus, end calculated from disk_addr is also a physical disk
> offset. Therefore, range checking should be done using map->disk_offset,
> not map->start.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>