svn commit: r312396 - head/cddl/usr.sbin/zfsd
Alan Somers
asomers at FreeBSD.org
Wed Jan 18 22:10:20 UTC 2017
Author: asomers
Date: Wed Jan 18 22:10:18 2017
New Revision: 312396
URL: https://svnweb.freebsd.org/changeset/base/312396
Log:
Fix an unchecked return value in zfsd
It's pretty unlikely to actually hit this, but good to check it anyway
Reported by: Coverity
CID: 1362018
MFC after: 4 weeks
Sponsored by: Spectra Logic Corp
Modified:
head/cddl/usr.sbin/zfsd/case_file.cc
Modified: head/cddl/usr.sbin/zfsd/case_file.cc
==============================================================================
--- head/cddl/usr.sbin/zfsd/case_file.cc Wed Jan 18 20:24:37 2017 (r312395)
+++ head/cddl/usr.sbin/zfsd/case_file.cc Wed Jan 18 22:10:18 2017 (r312396)
@@ -656,8 +656,11 @@ CaseFile::DeSerializeFile(const char *fi
uint64_t vdevGUID;
nvlist_t *vdevConf;
- sscanf(fileName, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case",
- &poolGUID, &vdevGUID);
+ if (sscanf(fileName, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case",
+ &poolGUID, &vdevGUID) != 2) {
+ throw ZfsdException("CaseFile::DeSerialize: "
+ "Unintelligible CaseFile filename %s.\n", fileName);
+ }
existingCaseFile = Find(Guid(poolGUID), Guid(vdevGUID));
if (existingCaseFile != NULL) {
/*
More information about the svn-src-all
mailing list