[PATCH] nfsd: fix using the correct variable for sizeof()

[PATCH] nfsd: fix using the correct variable for sizeof()

[Jakob Koschel]

While the original code is valid, it is not the obvious choice for the
sizeof() call and in preparation to limit the scope of the list iterator
variable the sizeof should be changed to the size of the destination.

Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
---
 fs/nfsd/nfs4layouts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 6d1b5bb051c5..2c05692a9abf 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -422,7 +422,7 @@ nfsd4_insert_layout(struct nfsd4_layoutget *lgp, struct nfs4_layout_stateid *ls)
 	new = kmem_cache_alloc(nfs4_layout_cache, GFP_KERNEL);
 	if (!new)
 		return nfserr_jukebox;
-	memcpy(&new->lo_seg, seg, sizeof(lp->lo_seg));
+	memcpy(&new->lo_seg, seg, sizeof(new->lo_seg));
 	new->lo_state = ls;
 
 	spin_lock(&fp->fi_lock);

base-commit: 34e047aa16c0123bbae8e2f6df33e5ecc1f56601
-- 
2.25.1

Re: [PATCH] nfsd: fix using the correct variable for sizeof()

[Chuck Lever III]

> On Mar 19, 2022, at 4:27 PM, Jakob Koschel <jakobkoschel@gmail.com> wrote:
> 
> While the original code is valid, it is not the obvious choice for the
> sizeof() call and in preparation to limit the scope of the list iterator
> variable the sizeof should be changed to the size of the destination.
> 
> Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
> ---
> fs/nfsd/nfs4layouts.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
> index 6d1b5bb051c5..2c05692a9abf 100644
> --- a/fs/nfsd/nfs4layouts.c
> +++ b/fs/nfsd/nfs4layouts.c
> @@ -422,7 +422,7 @@ nfsd4_insert_layout(struct nfsd4_layoutget *lgp, struct nfs4_layout_stateid *ls)
> 	new = kmem_cache_alloc(nfs4_layout_cache, GFP_KERNEL);
> 	if (!new)
> 		return nfserr_jukebox;
> -	memcpy(&new->lo_seg, seg, sizeof(lp->lo_seg));
> +	memcpy(&new->lo_seg, seg, sizeof(new->lo_seg));
> 	new->lo_state = ls;
> 
> 	spin_lock(&fp->fi_lock);
> 
> base-commit: 34e047aa16c0123bbae8e2f6df33e5ecc1f56601
> -- 
> 2.25.1
> 

Thanks, Jakob. Applied to the for-next branch at

https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git

--
Chuck Lever