Commit b287521e authored May 11, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman Jun 03, 2021

NFS: fix an incorrect limit in filelayout_decode_layout()

commit 769b01ea68b6c49dc3cde6adf7e53927dacbd3a8 upstream.

The "sizeof(struct nfs_fh)" is two bytes too large and could lead to
memory corruption. It should be NFS_MAXFHSIZE because that's the size
of the ->data[] buffer.

I reversed the size of the arguments to put the variable on the left.

Fixes: 16b374ca ("NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 77c55940

fs/nfs/filelayout/filelayout.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -726,7 +726,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,
		if (unlikely(!p))
		goto out_err;
		fl->fh_array[i]->size = be32_to_cpup(p++);
		if (sizeof(struct nfs_fh) < fl->fh_array[i]->size) {
		if (fl->fh_array[i]->size > NFS_MAXFHSIZE) {
		printk(KERN_ERR "NFS: Too big fh %d received %d\n",
		i, fl->fh_array[i]->size);
		goto out_err;