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

Don't assume either jid or name is set - they may not be from the

Browse Source 
command line.
This commit is contained in:
Jamie Gritton 2010-10-27 16:35:23 +00:00
parent 5553043801
commit 50f0104e67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/jailconf/; revision=214424
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/jail/jail.c
View File

@ -891,8 +891,7 @@ running_jid(struct cfjail *j, int dflag)
char *ep;
int jid;
pval = string_param(j->intparams[KP_JID]);
if (pval != NULL) {
if ((pval = string_param(j->intparams[KP_JID]))) {
if (!(jid = strtol(pval, &ep, 10)) || *ep) {
j->jid = -1;
return;
@ -901,13 +900,15 @@ running_jid(struct cfjail *j, int dflag)
jiov[0].iov_len = sizeof("jid");
jiov[1].iov_base = &jid;
jiov[1].iov_len = sizeof(jid);
} else {
pval = string_param(j->intparams[KP_NAME]);
} else if ((pval = string_param(j->intparams[KP_NAME]))) {
*(const void **)&jiov[0].iov_base = "name";
jiov[0].iov_len = sizeof("name");
jiov[1].iov_len = strlen(pval) + 1;
jiov[1].iov_base = alloca(jiov[1].iov_len);
strcpy(jiov[1].iov_base, pval);
} else {
j->jid = -1;
return;
}
j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0);
}