d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mountd: Return proper errno values in a few error paths

Browse Source 
When attempting to mount a non-directory which exists, return ENOTDIR instead
of ENOENT. If stat() or statfs() failed, don't pass part of the invalid
(struct statfs) to ex_search(). In that same case, preserve the value of "bad"
rather than overwriting with EACCES.

Submitted by:	Bruce Leverett (Panasas)
Reviewed by:	rmacklem
MFC after:	1 week
Sponsored by:	Panasas
Differential Revision:	https://reviews.freebsd.org/D14438
This commit is contained in:
Ravi Pokala 2018-02-21 00:19:02 +00:00
parent e5a4a83784
commit b235f015f8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=329682
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/mountd/mountd.c
View File

@ -1053,8 +1053,6 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp)
*/ */
if (realpath(rpcpath, dirpath) == NULL || if (realpath(rpcpath, dirpath) == NULL ||
stat(dirpath, &stb) < 0 || stat(dirpath, &stb) < 0 ||
(!S_ISDIR(stb.st_mode) &&
(dir_only || !S_ISREG(stb.st_mode))) ||
statfs(dirpath, &fsb) < 0) { statfs(dirpath, &fsb) < 0) {
chdir("/"); /* Just in case realpath doesn't */ chdir("/"); /* Just in case realpath doesn't */
syslog(LOG_NOTICE, syslog(LOG_NOTICE,
@ -1064,10 +1062,23 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp)
warnx("stat failed on %s", dirpath); warnx("stat failed on %s", dirpath);
bad = ENOENT; /* We will send error reply later */ bad = ENOENT; /* We will send error reply later */
} }
if (!bad &&
!S_ISDIR(stb.st_mode) &&
(dir_only || !S_ISREG(stb.st_mode))) {
syslog(LOG_NOTICE,
"mount request from %s for non-directory path %s",
numerichost, dirpath);
if (debug)
warnx("mounting non-directory %s", dirpath);
bad = ENOTDIR; /* We will send error reply later */
}
/* Check in the exports list */ /* Check in the exports list */
sigprocmask(SIG_BLOCK, &sighup_mask, NULL); sigprocmask(SIG_BLOCK, &sighup_mask, NULL);
ep = ex_search(&fsb.f_fsid); if (bad)
ep = NULL;
else
ep = ex_search(&fsb.f_fsid);
hostset = defset = 0; hostset = defset = 0;
if (ep && (chk_host(ep->ex_defdir, saddr, &defset, &hostset, if (ep && (chk_host(ep->ex_defdir, saddr, &defset, &hostset,
&numsecflavors, &secflavorsp) || &numsecflavors, &secflavorsp) ||
@ -1118,7 +1129,8 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp)
"mount request succeeded from %s for %s", "mount request succeeded from %s for %s",
numerichost, dirpath); numerichost, dirpath);
} else { } else {
bad = EACCES; if (!bad)
bad = EACCES;
syslog(LOG_NOTICE, syslog(LOG_NOTICE,
"mount request denied from %s for %s", "mount request denied from %s for %s",
numerichost, dirpath); numerichost, dirpath);