Skip to content

Commit f0b2eee

Browse files
sbashirogregkh
authored andcommitted
pNFS: Fix uninited ptr deref in block/scsi layout
[ Upstream commit 9768797 ] The error occurs on the third attempt to encode extents. When function ext_tree_prepare_commit() reallocates a larger buffer to retry encoding extents, the "layoutupdate_pages" page array is initialized only after the retry loop. But ext_tree_free_commitdata() is called on every iteration and tries to put pages in the array, thus dereferencing uninitialized pointers. An additional problem is that there is no limit on the maximum possible buffer_size. When there are too many extents, the client may create a layoutcommit that is larger than the maximum possible RPC size accepted by the server. During testing, we observed two typical scenarios. First, one memory page for extents is enough when we work with small files, append data to the end of the file, or preallocate extents before writing. But when we fill a new large file without preallocating, the number of extents can be huge, and counting the number of written extents in ext_tree_encode_commit() does not help much. Since this number increases even more between unlocking and locking of ext_tree, the reallocated buffer may not be large enough again and again. Co-developed-by: Konstantin Evtushenko <koevtushenko@yandex.com> Signed-off-by: Konstantin Evtushenko <koevtushenko@yandex.com> Signed-off-by: Sergey Bashirov <sergeybashirov@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20250630183537.196479-2-sergeybashirov@gmail.com Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2eb8d53 commit f0b2eee

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

fs/nfs/blocklayout/extent_tree.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,15 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p,
552552
return ret;
553553
}
554554

555+
/**
556+
* ext_tree_prepare_commit - encode extents that need to be committed
557+
* @arg: layout commit data
558+
*
559+
* Return values:
560+
* %0: Success, all required extents are encoded
561+
* %-ENOSPC: Some extents are encoded, but not all, due to RPC size limit
562+
* %-ENOMEM: Out of memory, extents not encoded
563+
*/
555564
int
556565
ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
557566
{
@@ -568,12 +577,12 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
568577
start_p = page_address(arg->layoutupdate_page);
569578
arg->layoutupdate_pages = &arg->layoutupdate_page;
570579

571-
retry:
572-
ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &count, &arg->lastbytewritten);
580+
ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size,
581+
&count, &arg->lastbytewritten);
573582
if (unlikely(ret)) {
574583
ext_tree_free_commitdata(arg, buffer_size);
575584

576-
buffer_size = ext_tree_layoutupdate_size(bl, count);
585+
buffer_size = NFS_SERVER(arg->inode)->wsize;
577586
count = 0;
578587

579588
arg->layoutupdate_pages =
@@ -588,7 +597,8 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
588597
return -ENOMEM;
589598
}
590599

591-
goto retry;
600+
ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size,
601+
&count, &arg->lastbytewritten);
592602
}
593603

594604
*start_p = cpu_to_be32(count);
@@ -608,7 +618,7 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
608618
}
609619

610620
dprintk("%s found %zu ranges\n", __func__, count);
611-
return 0;
621+
return ret;
612622
}
613623

614624
void

0 commit comments

Comments
 (0)