Date: Mon, 7 Jun 2021 01:03:57 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f9b3922257ba - stable/12 - ffs: Correct the input size check in sysctl_ffs_fsck() Message-ID: <202106070103.15713vBP099511@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f9b3922257ba343c824784f727da1805e71ce8d8 commit f9b3922257ba343c824784f727da1805e71ce8d8 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-05-31 22:56:34 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-06-07 01:03:38 +0000 ffs: Correct the input size check in sysctl_ffs_fsck() Make sure we return an error if no input was specified, since SYSCTL_IN() will report success in that case. Reported by: KMSAN Reviewed by: mckusick Sponsored by: The FreeBSD Foundation (cherry picked from commit b2f9575646f89cdddcad76acae3e9305535506a2) --- sys/ufs/ffs/ffs_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 6d9b459ccfd7..842b88ec178c 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -3153,9 +3153,9 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) int filetype, error; static struct fileops *origops, bufferedops; - if (req->newlen > sizeof cmd) + if (req->newptr == NULL || req->newlen > sizeof(cmd)) return (EBADRPC); - if ((error = SYSCTL_IN(req, &cmd, sizeof cmd)) != 0) + if ((error = SYSCTL_IN(req, &cmd, sizeof(cmd))) != 0) return (error); if (cmd.version != FFS_CMD_VERSION) return (ERPCMISMATCH);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106070103.15713vBP099511>