From patchwork Tue Oct 10 21:12:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Cashman X-Patchwork-Id: 9998155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17ABE603B5 for ; Tue, 10 Oct 2017 23:34:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08AC12870B for ; Tue, 10 Oct 2017 23:34:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1AEA2880C; Tue, 10 Oct 2017 23:34:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from ucol19pa12.eemsg.mail.mil (ucol19pa12.eemsg.mail.mil [214.24.24.85]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D60102870B for ; Tue, 10 Oct 2017 23:34:46 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.43,359,1503360000"; d="scan'208";a="408018256" Received: from emsm-gh1-uea10.ncsc.mil ([214.29.60.2]) by ucol19pa12.eemsg.mail.mil with ESMTP/TLS/AES256-SHA; 10 Oct 2017 23:34:45 +0000 Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by EMSM-GH1-UEA10.NCSC.MIL with ESMTP; 10 Oct 2017 23:34:45 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v9ANYYnH027780; Tue, 10 Oct 2017 19:34:35 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id v9ANYWbK053345 for ; Tue, 10 Oct 2017 19:34:32 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v9ANYWoB027778 for ; Tue, 10 Oct 2017 19:34:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1AbAwDFWN1ZWycVGNZdGgEBAQECAQEBA?= =?us-ascii?q?QgBAQEBgzAoA3tXJ48Njn+BdpYvgTMDXAoThSgChE9BFgECAQEBAQEBAQYaFYV?= =?us-ascii?q?8BicZAQE3AQ8gMTQBBQEIFAcSiFSBUAOcFUCLIYJYOoMJAQEFiCIBAQEBBgIBH?= =?us-ascii?q?QgSgxuBMlCBRwqBao4BIIoYiD+OaotAiRyLXYc/SJRsAgQCCQIGFCSBFSYEfD8?= =?us-ascii?q?yIQgdFYVUDgEcGYFuVocJLIIVAQEB?= X-IPAS-Result: =?us-ascii?q?A1AbAwDFWN1ZWycVGNZdGgEBAQECAQEBAQgBAQEBgzAoA3t?= =?us-ascii?q?XJ48Njn+BdpYvgTMDXAoThSgChE9BFgECAQEBAQEBAQYaFYV8BicZAQE3AQ8gM?= =?us-ascii?q?TQBBQEIFAcSiFSBUAOcFUCLIYJYOoMJAQEFiCIBAQEBBgIBHQgSgxuBMlCBRwq?= =?us-ascii?q?Bao4BIIoYiD+OaotAiRyLXYc/SJRsAgQCCQIGFCSBFSYEfD8yIQgdFYVUDgEcG?= =?us-ascii?q?YFuVocJLIIVAQEB?= X-IronPort-AV: E=Sophos;i="5.43,359,1503374400"; d="scan'208";a="78743" Received: from emsm-gh1-uea11.ncsc.mil ([214.29.60.35]) by goalie.tycho.ncsc.mil with ESMTP; 10 Oct 2017 19:34:31 -0400 Received: from uhil19pa08.eemsg.mail.mil (HELO uhil19pa08.eesmg.mail.mil) ([214.24.21.39]) by emsm-gh1-uea11.NCSC.MIL with ESMTP; 10 Oct 2017 23:34:28 +0000 X-EEMSG-check-005: 0 X-EEMSG-check-006: 000-001;8a44a6d9-391a-4b11-bd0a-de4867304001 Authentication-Results: uhilpa03.eemsg.mail.mil; dkim=pass (signature verified) header.i=@android.com X-EEMSG-check-008: 237069797|UHIL19PA03_EEMSG_MP1.csd.disa.mil X-EEMSG-SBRS: 3.4 X-EEMSG-ORIG-IP: 209.85.192.176 X-EEMSG-check-002: true X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AwAgBNSd1ZhrDAVdFcg2CgMJglgTMDXAoThSgChE9BFgMBAQEBAQEBEwEBAQgLCwgoL4UeBkABATcBDyAxNAEFARwHEohUgVCcKECLIYMSgwkBAQWISggJAQiDG4EyUIFRj2sgihiIP45qi0CJHItdhz0CSJRsAgQCCQIGFCSBFSYEfD8yIQgdFYViEQyCByCHPyyCFQEBAQ X-IPAS-Result: A0AwAgBNSd1ZhrDAVdFcg2CgMJglgTMDXAoThSgChE9BFgMBAQEBAQEBEwEBAQgLCwgoL4UeBkABATcBDyAxNAEFARwHEohUgVCcKECLIYMSgwkBAQWISggJAQiDG4EyUIFRj2sgihiIP45qi0CJHItdhz0CSJRsAgQCCQIGFCSBFSYEfD8yIQgdFYViEQyCByCHPyyCFQEBAQ Received: from mail-pf0-f176.google.com ([209.85.192.176]) by uhilpa03.eemsg.mail.mil with ESMTP; 10 Oct 2017 21:13:05 +0000 Received: by mail-pf0-f176.google.com with SMTP id p87so9494964pfj.3 for ; Tue, 10 Oct 2017 14:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DKUtAEEeA/wfmeTQ2myAjA3nToT+zWM6BTZG9p0GfY8=; b=jO5uTRYlfZjUeC3UvlqykJtCech3zuW5DI7QVB4v3niNa2b52S24no2LFNm6FBg9F+ YEmSpY5dLgeqqpdtlpm/T7hkrEy1Pe9qr3r1ED++qT80ZU4mdYmdmdQtBK0XQt92H02H 1pY2ozwTOiugOtHoiZ5TiuJpn7ZJ+WOIVZScpa8m0AIu95uqUgth9y8i7MqW8sLkZ2IW SyXrzX8RgQuzinL5WsKVhbKn4OjpIFbP8oL5KcgkqO7JZaYEVxQ2cafhaFNAlg84uHeE M6fk1LvLZHt811IgOxc2bMF92pfe5aRLj9uPaKN2DvwWa0Xe3ZBb814+HQaiq9ZTgvul PbBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DKUtAEEeA/wfmeTQ2myAjA3nToT+zWM6BTZG9p0GfY8=; b=HzveVIBrdWZ3FkLCjSsDUJnTWTCoBZxevnmcp7jm53s5pEBnyCYe3qEiwWdbbBPupH T7JaTEkagy1OFPcMD6+VRnG5W9/TEAaift3abCiiYrDX+AlL79VTnNup8DsgnwYdm0KT STU5EzZaqpPRP6b3sI7DuhQyoMkDQaDeAr8Kfz/oTIa7eQmclouM48NzAQMhGtVm5ZON afcStLB4qcNgHlHfUiUdPwxgAr9YtHRUl16uO/m6zbHsf3zQpvNeM/iLUcXSvhmuantz 7fVdKa1PrV9pFXVf2J1WOgsp3XVTxEUPwGduchbCk1vXNnagwYaNHHjr2mNbtBV4hENS R0Hw== X-Gm-Message-State: AMCzsaXIwFjQwE0hONL/Y2LwnIONss10uQ0AGj/JYAOlu2PhnDTMYpxs ojcgnSgEP/kFO0XD/976UcjomA== X-Google-Smtp-Source: AOwi7QCADvz2jza0xHVVKiGdajwanFIxepZszRoxfZgFUSBFet2PkufITOHf7DeTVOu0E6YtHsVydg== X-Received: by 10.84.179.165 with SMTP id b34mr13068783plc.15.1507669985236; Tue, 10 Oct 2017 14:13:05 -0700 (PDT) Received: from dcashman2.mtv.corp.google.com ([172.22.112.71]) by smtp.gmail.com with ESMTPSA id v15sm21255194pfa.50.2017.10.10.14.13.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Oct 2017 14:13:04 -0700 (PDT) X-EEMSG-check-009: 444-444 From: Daniel Cashman To: sds@tycho.nsa.gov, selinux@tycho.nsa.gov Date: Tue, 10 Oct 2017 14:12:57 -0700 Message-Id: <20171010211257.18474-1-dcashman@android.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <1505939283.31597.11.camel@tycho.nsa.gov> References: <1505939283.31597.11.camel@tycho.nsa.gov> Subject: [PATCH] selinux: libselinux: Enable multiple input files to selabel_open. X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Cc: jwcart2@tycho.nsa.gov, Dan Cashman Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: Dan Cashman The file_contexts labeling backend, specified in label_file.c, currently assumes that only one path will be specified as an option to selabel_open(). The split of platform and non-platform policy on device, however, will necessitate the loading of two disparate policy files. Rather than combining the files and then calling the existing API on a newly-formed file, just add the ability to specify multiple files to use. Order of opt specification to selabel_open matters. This corresponds to AOSP commit 50400d38203e4db08314168e60c281cc61a717a8, which lead to a fork with upstream, which we'd like to correct. Signed-off-by: Dan Cashman --- libselinux/src/label.c | 21 +++++--- libselinux/src/label_db.c | 4 +- libselinux/src/label_file.c | 104 +++++++++++++++++++++++++++++----------- libselinux/src/label_internal.h | 5 +- libselinux/src/label_media.c | 4 +- libselinux/src/label_x.c | 4 +- 6 files changed, 103 insertions(+), 39 deletions(-) diff --git a/libselinux/src/label.c b/libselinux/src/label.c index 48f4d2d6..0dfa054c 100644 --- a/libselinux/src/label.c +++ b/libselinux/src/label.c @@ -143,7 +143,11 @@ static int selabel_fini(struct selabel_handle *rec, struct selabel_lookup_rec *lr, int translating) { - if (compat_validate(rec, lr, rec->spec_file, 0)) + char *path = NULL; + + if (rec->spec_files) + path = rec->spec_files[0]; + if (compat_validate(rec, lr, path, 0)) return -1; if (translating && !lr->ctx_trans && @@ -226,11 +230,9 @@ struct selabel_handle *selabel_open(unsigned int backend, rec->digest = selabel_is_digest_set(opts, nopts, rec->digest); if ((*initfuncs[backend])(rec, opts, nopts)) { - free(rec->spec_file); - free(rec); + selabel_close(rec); rec = NULL; } - out: return rec; } @@ -337,10 +339,17 @@ int selabel_digest(struct selabel_handle *rec, void selabel_close(struct selabel_handle *rec) { + size_t i; + + if (rec->spec_files) { + for (i = 0; i < rec->spec_files_len; i++) + free(rec->spec_files[i]); + free(rec->spec_files); + } if (rec->digest) selabel_digest_fini(rec->digest); - rec->func_close(rec); - free(rec->spec_file); + if (rec->func_close) + rec->func_close(rec); free(rec); } diff --git a/libselinux/src/label_db.c b/libselinux/src/label_db.c index c46d0a1d..205ff5f4 100644 --- a/libselinux/src/label_db.c +++ b/libselinux/src/label_db.c @@ -290,7 +290,9 @@ db_init(const struct selinux_opt *opts, unsigned nopts, errno = EINVAL; return NULL; } - rec->spec_file = strdup(path); + rec->spec_files_len = 1; + rec->spec_files = calloc(rec->spec_files_len, sizeof(path)) + rec->spec_files[0] = strdup(path); /* * Parse for each lines diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c index 560d8c3d..b3b36bc2 100644 --- a/libselinux/src/label_file.c +++ b/libselinux/src/label_file.c @@ -709,28 +709,61 @@ static int init(struct selabel_handle *rec, const struct selinux_opt *opts, unsigned n) { struct saved_data *data = (struct saved_data *)rec->data; - const char *path = NULL; + size_t num_paths = 0; + char **path = NULL; const char *prefix = NULL; - int status = -1, baseonly = 0; + int status = -1; + size_t i; + bool baseonly = false; + bool path_provided; /* Process arguments */ - while (n--) - switch(opts[n].type) { + i = n; + while (i--) + switch(opts[i].type) { case SELABEL_OPT_PATH: - path = opts[n].value; + num_paths++; break; case SELABEL_OPT_SUBSET: - prefix = opts[n].value; + prefix = opts[i].value; break; case SELABEL_OPT_BASEONLY: - baseonly = !!opts[n].value; + baseonly = !!opts[i].value; break; } + if (!num_paths) { + num_paths = 1; + path_provided = false; + } else { + path_provided = true; + } + + path = calloc(num_paths, sizeof(*path)); + if (path == NULL) { + goto finish; + } + rec->spec_files = path; + rec->spec_files_len = num_paths; + + if (path_provided) { + for (i = 0; i < n; i++) { + switch(opts[i].type) { + case SELABEL_OPT_PATH: + *path = strdup(opts[i].value); + if (*path == NULL) + goto finish; + path++; + break; + default: + break; + } + } + } #if !defined(BUILD_HOST) && !defined(ANDROID) char subs_file[PATH_MAX + 1]; /* Process local and distribution substitution files */ - if (!path) { + if (!path_provided) { status = selabel_subs_init( selinux_file_context_subs_dist_path(), rec->digest, &data->dist_subs); @@ -740,43 +773,52 @@ static int init(struct selabel_handle *rec, const struct selinux_opt *opts, rec->digest, &data->subs); if (status) goto finish; - path = selinux_file_context_path(); + rec->spec_files[0] = strdup(selinux_file_context_path()); + if (rec->spec_files[0] == NULL) + goto finish; } else { - snprintf(subs_file, sizeof(subs_file), "%s.subs_dist", path); - status = selabel_subs_init(subs_file, rec->digest, + for (i = 0; i < num_paths; i++) { + snprintf(subs_file, sizeof(subs_file), "%s.subs_dist", rec->spec_files[i]); + status = selabel_subs_init(subs_file, rec->digest, &data->dist_subs); - if (status) - goto finish; - snprintf(subs_file, sizeof(subs_file), "%s.subs", path); - status = selabel_subs_init(subs_file, rec->digest, + if (status) + goto finish; + snprintf(subs_file, sizeof(subs_file), "%s.subs", rec->spec_files[i]); + status = selabel_subs_init(subs_file, rec->digest, &data->subs); - if (status) - goto finish; + if (status) + goto finish; + } + } +#else + if (!path_provided) { + selinux_log(SELINUX_ERROR, "No path given to file labeling backend\n"); + goto finish; } - #endif - rec->spec_file = strdup(path); /* - * The do detailed validation of the input and fill the spec array + * Do detailed validation of the input and fill the spec array */ - status = process_file(path, NULL, rec, prefix, rec->digest); - if (status) - goto finish; - - if (rec->validating) { - status = nodups_specs(data, path); + for (i = 0; i < num_paths; i++) { + status = process_file(rec->spec_files[i], NULL, rec, prefix, rec->digest); if (status) goto finish; + + if (rec->validating) { + status = nodups_specs(data, rec->spec_files[i]); + if (status) + goto finish; + } } if (!baseonly) { - status = process_file(path, "homedirs", rec, prefix, + status = process_file(rec->spec_files[0], "homedirs", rec, prefix, rec->digest); if (status && errno != ENOENT) goto finish; - status = process_file(path, "local", rec, prefix, + status = process_file(rec->spec_files[0], "local", rec, prefix, rec->digest); if (status && errno != ENOENT) goto finish; @@ -804,6 +846,12 @@ static void closef(struct selabel_handle *rec) struct stem *stem; unsigned int i; + if (!data) + return; + + /* make sure successive ->func_close() calls are harmless */ + rec->data = NULL; + selabel_subs_fini(data->subs); selabel_subs_fini(data->dist_subs); diff --git a/libselinux/src/label_internal.h b/libselinux/src/label_internal.h index c55efb75..43b63513 100644 --- a/libselinux/src/label_internal.h +++ b/libselinux/src/label_internal.h @@ -98,10 +98,11 @@ struct selabel_handle { void *data; /* - * The main spec file used. Note for file contexts the local and/or + * The main spec file(s) used. Note for file contexts the local and/or * homedirs could also have been used to resolve a context. */ - char *spec_file; + size_t spec_files_len; + char **spec_files; /* ptr to SHA1 hash information if SELABEL_OPT_DIGEST set */ struct selabel_digest *digest; diff --git a/libselinux/src/label_media.c b/libselinux/src/label_media.c index d202e5d5..f4a46ffe 100644 --- a/libselinux/src/label_media.c +++ b/libselinux/src/label_media.c @@ -100,7 +100,9 @@ static int init(struct selabel_handle *rec, const struct selinux_opt *opts, errno = EINVAL; return -1; } - rec->spec_file = strdup(path); + rec->spec_files_len = 1; + rec->spec_files = calloc(rec->spec_files_len, sizeof(path)) + rec->spec_files[0] = strdup(path); /* * Perform two passes over the specification file. diff --git a/libselinux/src/label_x.c b/libselinux/src/label_x.c index 96745299..54ebd2eb 100644 --- a/libselinux/src/label_x.c +++ b/libselinux/src/label_x.c @@ -127,7 +127,9 @@ static int init(struct selabel_handle *rec, const struct selinux_opt *opts, errno = EINVAL; return -1; } - rec->spec_file = strdup(path); + rec->spec_files_len = 1; + rec->spec_files = calloc(rec->spec_files_len, sizeof(path)) + rec->spec_files[0] = strdup(path); /* * Perform two passes over the specification file.