From 104c8e6c55ebc80b69c5871d8f4497bc850540d6 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 31 May 2017 05:40:32 +0200 Subject: [PATCH] confile: add getter for lxc.aa_profile Signed-off-by: Christian Brauner --- src/lxc/confile.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 5b999e023..bd9066b14 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -80,6 +80,8 @@ static int set_config_kmsg(const char *, const char *, struct lxc_conf *); static int get_config_kmsg(struct lxc_container *, const char *, char *, int); static int set_config_lsm_aa_profile(const char *, const char *, struct lxc_conf *); +static int get_config_lsm_aa_profile(struct lxc_container *, const char *, char *, int); + static int set_config_lsm_aa_incomplete(const char *, const char *, struct lxc_conf *); static int set_config_lsm_se_context(const char *, const char *, struct lxc_conf *); static int set_config_cgroup(const char *, const char *, struct lxc_conf *); @@ -136,12 +138,12 @@ static int set_config_no_new_privs(const char *, const char *, struct lxc_conf * static int set_config_limit(const char *, const char *, struct lxc_conf *); static struct lxc_config_t config[] = { - { "lxc.arch", set_config_personality, get_config_personality, NULL}, - { "lxc.pts", set_config_pts, get_config_pts, NULL}, - { "lxc.tty", set_config_tty, get_config_tty, NULL}, - { "lxc.devttydir", set_config_ttydir, get_config_ttydir, NULL}, - { "lxc.kmsg", set_config_kmsg, get_config_kmsg, NULL}, - { "lxc.aa_profile", set_config_lsm_aa_profile, NULL, NULL}, + { "lxc.arch", set_config_personality, get_config_personality, NULL}, + { "lxc.pts", set_config_pts, get_config_pts, NULL}, + { "lxc.tty", set_config_tty, get_config_tty, NULL}, + { "lxc.devttydir", set_config_ttydir, get_config_ttydir, NULL}, + { "lxc.kmsg", set_config_kmsg, get_config_kmsg, NULL}, + { "lxc.aa_profile", set_config_lsm_aa_profile, get_config_lsm_aa_profile, NULL}, { "lxc.aa_allow_incomplete", set_config_lsm_aa_incomplete, NULL, NULL}, { "lxc.se_context", set_config_lsm_se_context, NULL, NULL}, { "lxc.cgroup", set_config_cgroup, NULL, NULL}, @@ -3014,8 +3016,6 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, return lxc_get_auto_mounts(c, retv, inlen); else if (strcmp(key, "lxc.mount") == 0) v = c->fstab; - else if (strcmp(key, "lxc.aa_profile") == 0) - v = c->lsm_aa_profile; else if (strcmp(key, "lxc.aa_allow_incomplete") == 0) return lxc_get_conf_int(c, retv, inlen, c->lsm_aa_allow_incomplete); else if (strcmp(key, "lxc.se_context") == 0) @@ -3730,3 +3730,9 @@ static int get_config_kmsg(struct lxc_container *c, const char *key, char *retv, { return lxc_get_conf_int(c->lxc_conf, retv, inlen, c->lxc_conf->kmsg); } + +static int get_config_lsm_aa_profile(struct lxc_container *c, const char *key, + char *retv, int inlen) +{ + return lxc_get_conf_str(retv, inlen, c->lxc_conf->lsm_aa_profile); +}