svn commit: r301783 - stable/9/sbin/fsck_ffs

[Garrett Cooper]

Author: ngie
Date: Fri Jun 10 14:10:51 2016
New Revision: 301783
URL: https://svnweb.freebsd.org/changeset/base/301783

Log:
  MFstable/10 r301782:
  
  MFC r299460:
  r299460 (by cem):
  
  fsck_ffs: Don't overrun mount device buffer
  
  Maybe this case is impossible.  Either way, when attempting to "/dev/"-prefix a
  non-global device name, check that we do not overrun the f_mntfromname buffer.
  
  In this case, truncating (with strlcpy or similar) would not be useful, since
  the f_mntfromname result of getmntpt() is passed directly to open(2) later.
  
  CID:		1006789

Modified:
  stable/9/sbin/fsck_ffs/main.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/fsck_ffs/   (props changed)

Modified: stable/9/sbin/fsck_ffs/main.c
==============================================================================
--- stable/9/sbin/fsck_ffs/main.c	Fri Jun 10 14:08:41 2016	(r301782)
+++ stable/9/sbin/fsck_ffs/main.c	Fri Jun 10 14:10:51 2016	(r301783)
@@ -627,6 +627,9 @@ getmntpt(const char *name)
 		statfsp = &mntbuf[i];
 		ddevname = statfsp->f_mntfromname;
 		if (*ddevname != '/') {
+			if (strlen(_PATH_DEV) + strlen(ddevname) + 1 >
+			    sizeof(statfsp->f_mntfromname))
+				continue;
 			strcpy(device, _PATH_DEV);
 			strcat(device, ddevname);
 			strcpy(statfsp->f_mntfromname, device);