talexander
/
freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mountd: Add check for "=" after exports(5) options 

Some exports(5) options take a "=arg" component that provides an
argument value for the option.  Others do not.
Without this patch, if "=arg" was provided for an option that did
not take an argument value, the "=arg" was simply ignored.
This could result in confusion w.r.t. what was being exported,
as noted by the Problem Report.

This patch adds a check for "=arg" for the options that do not
take an argument value and fails the exports line if one is found.

PR:	281003
MFC after:	 2 weeks
This commit is contained in:
Rick Macklem 2024-09-06 16:41:12 -07:00
parent 2b7f2890a8
commit 3df987c99d
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2825,7 +2825,7 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
{
char *cpoptarg, *cpoptend;
char *cp, *endcp, *cpopt, savedc, savedc2;
int allflag, usedarg;
int allflag, usedarg, fnd_equal;
savedc2 = '\0';
cpopt = *cpp;
@ -2836,14 +2836,18 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
while (cpopt && *cpopt) {
allflag = 1;
usedarg = -2;
fnd_equal = 0;
if ((cpoptend = strchr(cpopt, ','))) {
*cpoptend++ = '\0';
if ((cpoptarg = strchr(cpopt, '=')))
if ((cpoptarg = strchr(cpopt, '='))) {
*cpoptarg++ = '\0';
fnd_equal = 1;
}
} else {
if ((cpoptarg = strchr(cpopt, '=')))
if ((cpoptarg = strchr(cpopt, '='))) {
*cpoptarg++ = '\0';
else {
fnd_equal = 1;
} else {
*cp = savedc;
nextfield(&cp, &endcp);
**endcpp = '\0';
@ -2856,6 +2860,10 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
}
}
if (!strcmp(cpopt, "ro") || !strcmp(cpopt, "o")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= MNT_EXRDONLY;
} else if (cpoptarg && (!strcmp(cpopt, "maproot") ||
!(allflag = strcmp(cpopt, "mapall")) ||
@ -2894,15 +2902,31 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
usedarg++;
opt_flags |= OP_NET;
} else if (!strcmp(cpopt, "alldirs")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
opt_flags |= OP_ALLDIRS;
} else if (!strcmp(cpopt, "public")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= MNT_EXPUBLIC;
} else if (!strcmp(cpopt, "webnfs")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= (MNT_EXPUBLIC|MNT_EXRDONLY|MNT_EXPORTANON);
opt_flags |= OP_MAPALL;
} else if (cpoptarg && !strcmp(cpopt, "index")) {
ep->ex_indexfile = strdup(cpoptarg);
} else if (!strcmp(cpopt, "quiet")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
opt_flags |= OP_QUIET;
} else if (cpoptarg && !strcmp(cpopt, "sec")) {
if (parsesec(cpoptarg, ep))
@ -2910,10 +2934,22 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
opt_flags |= OP_SEC;
usedarg++;
} else if (!strcmp(cpopt, "tls")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= MNT_EXTLS;
} else if (!strcmp(cpopt, "tlscert")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT);
} else if (!strcmp(cpopt, "tlscertuser")) {
if (fnd_equal == 1) {
syslog(LOG_ERR, "= after op: %s", cpopt);
return (1);
}
*exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT |
MNT_EXTLSCERTUSER);
} else {