From 31fc349409e6a2fc81ec2a3efd18e49b64a8a8a7 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 31 May 2017 15:03:26 +0200 Subject: [PATCH] confile: add clearer for lxc.se_context Signed-off-by: Christian Brauner --- src/lxc/confile.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 7b0c48cca..ca0eb96fb 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -93,6 +93,7 @@ static int clr_config_lsm_aa_incomplete(const char *, struct lxc_conf *); static int set_config_lsm_se_context(const char *, const char *, struct lxc_conf *); static int get_config_lsm_se_context(const char *, char *, int, struct lxc_conf *); +static int clr_config_lsm_se_context(const char *, struct lxc_conf *); static int set_config_cgroup(const char *, const char *, struct lxc_conf *); static int get_config_cgroup(const char *, char *, int, struct lxc_conf *); @@ -227,7 +228,7 @@ static struct lxc_config_t config[] = { { "lxc.kmsg", set_config_kmsg, get_config_kmsg, clr_config_kmsg, }, { "lxc.aa_profile", set_config_lsm_aa_profile, get_config_lsm_aa_profile, clr_config_lsm_aa_profile, }, { "lxc.aa_allow_incomplete", set_config_lsm_aa_incomplete, get_config_lsm_aa_incomplete, clr_config_lsm_aa_incomplete, }, - { "lxc.se_context", set_config_lsm_se_context, get_config_lsm_se_context, NULL }, + { "lxc.se_context", set_config_lsm_se_context, get_config_lsm_se_context, clr_config_lsm_se_context, }, { "lxc.cgroup", set_config_cgroup, get_config_cgroup, NULL }, { "lxc.id_map", set_config_idmaps, get_config_idmaps, NULL }, { "lxc.loglevel", set_config_loglevel, get_config_loglevel, NULL }, @@ -2830,10 +2831,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key) free(c->rootfs.bdev_type); c->rootfs.bdev_type = NULL; - } else if (strcmp(key, "lxc.se_context") == 0) { - free(c->lsm_se_context); - c->lsm_se_context = NULL; - } else if (strcmp(key, "lxc.seccomp") == 0) { free(c->seccomp); c->seccomp = NULL; @@ -4109,3 +4106,10 @@ static inline int clr_config_lsm_aa_incomplete(const char *key, c->lsm_aa_allow_incomplete = 0; return 0; } + +static inline int clr_config_lsm_se_context(const char *key, struct lxc_conf *c) +{ + free(c->lsm_se_context); + c->lsm_se_context = NULL; + return 0; +} -- 2.47.3