conf/ile: avoid atoi() in config_ephemeral()

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
This commit is contained in:
Christian Brauner 2016-10-28 20:24:17 +02:00
parent ff6cb4ed82
commit 66ffdb1a20
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 4 additions and 5 deletions

View File

@ -377,7 +377,7 @@ struct lxc_conf {
gid_t init_gid;
/* indicator if the container will be destroyed on shutdown */
int ephemeral;
unsigned int ephemeral;
/* The facility to pass to syslog. Let's users establish as what type of
* program liblxc is supposed to write to the syslog. */

View File

@ -2964,13 +2964,12 @@ bool network_new_hwaddrs(struct lxc_conf *conf)
static int config_ephemeral(const char *key, const char *value,
struct lxc_conf *lxc_conf)
{
int v = atoi(value);
if (lxc_safe_uint(value, &lxc_conf->ephemeral) < 0)
return -1;
if (v != 0 && v != 1) {
if (lxc_conf->ephemeral > 1) {
ERROR("Wrong value for lxc.ephemeral. Can only be set to 0 or 1");
return -1;
} else {
lxc_conf->ephemeral = v;
}
return 0;