mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-04 09:09:56 +00:00
Code Issues Releases Activity

bectl(8): Check jailparam_* return values

Browse Source 
Previous iteration of this assumed that these won't fail because we've
already setup the jail param to this point, but the allocations could still
fail in pretty bad conditions.

Admit that it's possible and return (ENOENT, EINVAL, ENOMEM, or 0) when
deleting arguments. EINVAL shouldn't happen since we're passing optarg;
which may satisfy *optarg == '\0' but never optarg == NULL.

CID:		1394885, 1394901
This commit is contained in:
Kyle Evans 2018-08-14 18:35:33 +00:00
parent cc4deabc28
commit 4c5d19fda4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337805
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sbin/bectl/bectl_jail.c
View File

@ -44,9 +44,9 @@ __FBSDID("$FreeBSD$");
static void jailparam_grow(void);
static void jailparam_add(const char *name, const char *val);
static void jailparam_del(const char *name);
static int jailparam_del(const char *name);
static bool jailparam_addarg(char *arg);
static bool jailparam_delarg(char *arg);
static int jailparam_delarg(char *arg);
static int bectl_search_jail_paths(const char *mnt);
static int bectl_locate_jail(const char *ident);
@ -92,7 +92,7 @@ jailparam_add(const char *name, const char *val)
++jpused;
}
static void
static int
jailparam_del(const char *name)
{
int i;
@ -103,21 +103,32 @@ jailparam_del(const char *name)
break;
}
/* Not found... technically successful */
if (i == jpused)
return;
return (ENOENT);
for (; i < jpused - 1; ++i) {
val = jailparam_export(&jp[i + 1]);
jailparam_free(&jp[i], 1);
jailparam_init(&jp[i], jp[i + 1].jp_name);
jailparam_import(&jp[i], val);
/*
* Given the context, the following will really only fail if
* they can't allocate the copy of the name or value.
*/
if (jailparam_init(&jp[i], jp[i + 1].jp_name) != 0) {
free(val);
return (ENOMEM);
}
if (jailparam_import(&jp[i], val) != 0) {
jailparam_free(&jp[i], 1);
free(val);
return (ENOMEM);
}
free(val);
}
jailparam_free(&jp[i], 1);
--jpused;
return (0);
}
static bool
@ -148,28 +159,27 @@ jailparam_addarg(char *arg)
return (true);
}
static bool
static int
jailparam_delarg(char *arg)
{
char *name, *val;
if (arg == NULL)
return (false);
return (EINVAL);
name = arg;
if ((val = strchr(name, '=')) != NULL)
*val++ = '\0';
if (strcmp(name, "path") == 0)
*mnt_loc = '\0';
jailparam_del(name);
return (true);
return (jailparam_del(name));
}
int
bectl_cmd_jail(int argc, char *argv[])
{
char *bootenv, *mountpoint;
int jid, opt;
int jid, opt, ret;
bool default_hostname, default_name;
default_hostname = default_name = true;
@ -198,11 +208,16 @@ bectl_cmd_jail(int argc, char *argv[])
}
break;
case 'u':
if (jailparam_delarg(optarg)) {
if ((ret = jailparam_delarg(optarg)) == 0) {
if (strcmp(optarg, "name") == 0)
default_name = true;
if (strcmp(optarg, "host.hostname") == 0)
default_hostname = true;
} else if (ret != ENOENT) {
fprintf(stderr,
"bectl jail: error unsetting \"%s\"\n",
optarg);
return (ret);
}
break;
default: