mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 16:59:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3738 from brauner/2021-03-26/fixes_3

Browse Source 
oss-fuzz: fixes
This commit is contained in:
Stéphane Graber
2021-03-26 18:22:30 -04:00
committed by GitHub
parent 8c70a4080b 5837aa8448
commit 6a374b65e7
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lxc/conf.c
View File

@@ -3754,6 +3754,7 @@ int lxc_clear_limits(struct lxc_conf *c, const char *key)
free_disarm(lim->resource); free_disarm(lim->resource);
free(lim); free(lim);
free(it);
} }
if (all) if (all)

2
src/lxc/conf.h
View File

@@ -104,7 +104,7 @@ struct lxc_limit {
static void free_lxc_limit(struct lxc_limit *ptr) static void free_lxc_limit(struct lxc_limit *ptr)
{ {
if (ptr) { if (ptr) {
free(ptr->resource); free_disarm(ptr->resource);
free_disarm(ptr); free_disarm(ptr);
} }
} }

37
src/lxc/confile.c
View File

@@ -525,6 +525,7 @@ static int set_config_net_veth_vlan_id(const char *key, const char *value,
netdev->priv.veth_attr.vlan_id = BRIDGE_VLAN_NONE; netdev->priv.veth_attr.vlan_id = BRIDGE_VLAN_NONE;
} else { } else {
unsigned short vlan_id; unsigned short vlan_id;
ret = get_u16(&vlan_id, value, 0); ret = get_u16(&vlan_id, value, 0);
if (ret < 0) if (ret < 0)
return ret_errno(EINVAL); return ret_errno(EINVAL);
@@ -555,10 +556,10 @@ static int set_config_net_veth_vlan_tagged_id(const char *key, const char *value
ret = get_u16(&vlan_id, value, 0); ret = get_u16(&vlan_id, value, 0);
if (ret < 0) if (ret < 0)
ret_errno(EINVAL); return ret_errno(EINVAL);
if (vlan_id > BRIDGE_VLAN_ID_MAX) if (vlan_id > BRIDGE_VLAN_ID_MAX)
ret_errno(EINVAL); return ret_errno(EINVAL);
list = lxc_list_new(); list = lxc_list_new();
if (!list) if (!list)
@@ -1929,8 +1930,8 @@ static bool parse_limit_value(const char **value, rlim_t *res)
static int set_config_prlimit(const char *key, const char *value, static int set_config_prlimit(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
__do_free struct lxc_list *limlist = NULL; __do_free struct lxc_list *list = NULL;
call_cleaner(free_lxc_limit) struct lxc_limit *limelem = NULL; call_cleaner(free_lxc_limit) struct lxc_limit *elem = NULL;
struct lxc_list *iter; struct lxc_list *iter;
struct rlimit limit; struct rlimit limit;
rlim_t limit_value; rlim_t limit_value;
@@ -1981,29 +1982,31 @@ static int set_config_prlimit(const char *key, const char *value,
/* find existing list element */ /* find existing list element */
lxc_list_for_each(iter, &lxc_conf->limits) { lxc_list_for_each(iter, &lxc_conf->limits) {
limelem = iter->elem; struct lxc_limit *cur = iter->elem;
if (strequal(key, limelem->resource)) {
limelem->limit = limit; if (!strequal(key, cur->resource))
continue;
cur->limit = limit;
return 0; return 0;
} }
}
/* allocate list element */ /* allocate list element */
limlist = lxc_list_new(); list = lxc_list_new();
if (!limlist) if (!list)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
limelem = zalloc(sizeof(*limelem)); elem = zalloc(sizeof(*elem));
if (!limelem) if (!elem)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
limelem->resource = strdup(key); elem->resource = strdup(key);
if (!limelem->resource) if (!elem->resource)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
limelem->limit = limit; elem->limit = limit;
lxc_list_add_elem(limlist, move_ptr(limelem));; lxc_list_add_elem(list, move_ptr(elem));;
lxc_list_add_tail(&lxc_conf->limits, move_ptr(limlist)); lxc_list_add_tail(&lxc_conf->limits, move_ptr(list));
return 0; return 0;
} }