Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Prevent NULL pointer dereference of resid 

spa_config_load() passes NULL into resid when doing zfs_file_read().
This would trip over when vfs.zfs.autoimport_disable=0.

Sponsored by: The FreeBSD Foundation
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Signed-off-by: Ka Ho Ng <khng@freebsdfoundation.org>
Closes #11149
This commit is contained in:
khng300 2020-11-05 08:50:08 +08:00 committed by Brian Behlendorf
parent e518548e17
commit ef648fec0e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/freebsd/zfs/zfs_file_os.c
View File

@ -158,7 +158,8 @@ zfs_file_read_impl(zfs_file_t *fp, void *buf, size_t count, loff_t *offp,
rc = fo_read(fp, &auio, td->td_ucred, FOF_OFFSET, td); rc = fo_read(fp, &auio, td->td_ucred, FOF_OFFSET, td);
if (rc) if (rc)
return (SET_ERROR(rc)); return (SET_ERROR(rc));
*resid = auio.uio_resid; if (resid)
*resid = auio.uio_resid;
*offp += count - auio.uio_resid; *offp += count - auio.uio_resid;
return (SET_ERROR(0)); return (SET_ERROR(0));
} }