From bcbaf9fd4720d0d9caaef7f6b072cacbd7911407 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Fri, 14 Apr 2017 00:22:28 +0000 Subject: [PATCH] fsck(8): Don't overrun mount device buffer Apply a very similar fix to r299460 (fsck_ffs) to apparently duplicated code in fsck. Reported by: Coverity CID: 1006789 Sponsored by: Dell EMC Isilon --- sbin/fsck/fsutil.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index 935992e9bda..348b288ed21 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -172,6 +172,9 @@ getmntpt(const char *name) statfsp = &mntbuf[i]; dev_name = statfsp->f_mntfromname; if (*dev_name != '/') { + if (strlen(_PATH_DEV) + strlen(dev_name) + 1 > + sizeof(statfsp->f_mntfromname)) + continue; strcpy(device, _PATH_DEV); strcat(device, dev_name); strcpy(statfsp->f_mntfromname, device);