iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: fix an incorrect limit in filelayout_decode_layout()

Browse Source 
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: 16b374ca439f ("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>
This commit is contained in:
Dan Carpenter 2021-05-11 11:49:42 +03:00 committed by Trond Myklebust
parent bb00238890
commit 769b01ea68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/filelayout/filelayout.c
View File

@ -718,7 +718,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,
if (unlikely(!p)) if (unlikely(!p))
goto out_err; goto out_err;
fl->fh_array[i]->size = be32_to_cpup(p++); 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", printk(KERN_ERR "NFS: Too big fh %d received %d\n",
i, fl->fh_array[i]->size); i, fl->fh_array[i]->size);
goto out_err; goto out_err;