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

Fix a couple of NULL dereferences.

Browse Source
This commit is contained in:
Jamie Gritton 2011-06-21 19:13:48 +00:00
parent 5fb611c2bf
commit c6eff841df
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/jailconf/; revision=223368
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/jail/command.c
View File

@ -77,6 +77,7 @@ static int check_path(struct cfjail *j, const char *pname, const char *path,
static struct cfjails sleeping = TAILQ_HEAD_INITIALIZER(sleeping);
static struct cfjails runnable = TAILQ_HEAD_INITIALIZER(runnable);
static struct cfstring dummystring = { .len = 1 };
static struct phhead phash[PHASH_SIZE];
static int kq;
@ -89,8 +90,6 @@ next_command(struct cfjail *j)
enum intparam comparam;
int rval, create_failed;
static struct cfstring dummystring = { .len = 1 };
rval = 0;
create_failed = (j->flags & (JF_STOP | JF_FAILED)) == JF_FAILED;
for (; (comparam = *j->comparam);
@ -115,7 +114,8 @@ next_command(struct cfjail *j)
}
}
for (; j->comstring != NULL;
j->comstring = create_failed
j->comstring = j->comstring == &dummystring ? NULL :
create_failed
? TAILQ_PREV(j->comstring, cfstrings, tq)
: TAILQ_NEXT(j->comstring, tq)) {
if (rval != 0)
@ -457,7 +457,7 @@ run_command(struct cfjail *j)
TAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq)
argv[argc++] = s->s;
argv[argc] = NULL;
j->comstring = NULL;
j->comstring = &dummystring;
break;
default: