From patchwork Sat Apr 23 06:04:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Zaman X-Patchwork-Id: 8916961 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5013A9F1C1 for ; Sat, 23 Apr 2016 06:10:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 693582026F for ; Sat, 23 Apr 2016 06:10:23 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (emvm-gh1-uea09.nsa.gov [8.44.101.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26DAD20225 for ; Sat, 23 Apr 2016 06:10:22 +0000 (UTC) X-TM-IMSS-Message-ID: Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id b0affaa30000644f ; Sat, 23 Apr 2016 02:07:44 -0400 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 u3N68Bnc007943; Sat, 23 Apr 2016 02:08:11 -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 u3N65alX117835 for ; Sat, 23 Apr 2016 02:05:36 -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 u3N65XAH007368 for ; Sat, 23 Apr 2016 02:05:36 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CtBACSDxtX/yUp0Apegw2Be7d2gmqBIAgXhXcCgW4BAQEBAQFmJ4RCAQEBAxIVGQEBNwEPUTQBBQEcGSKICAGgd4ExPjGKT4UoAQSMSQEBAQEBBQIBFwYKhA2NXAtAgkOHeYVfc4lJjhZjiEaFZUWNLDCBDmKBeA0bFoFCXwGIegEBAQ X-IPAS-Result: A0CtBACSDxtX/yUp0Apegw2Be7d2gmqBIAgXhXcCgW4BAQEBAQFmJ4RCAQEBAxIVGQEBNwEPUTQBBQEcGSKICAGgd4ExPjGKT4UoAQSMSQEBAQEBBQIBFwYKhA2NXAtAgkOHeYVfc4lJjhZjiEaFZUWNLDCBDmKBeA0bFoFCXwGIegEBAQ X-IronPort-AV: E=Sophos;i="5.24,520,1454994000"; d="scan'208";a="5403915" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 23 Apr 2016 02:05:35 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AUg1YXxQMFJlSoeYO1L6uGMO41tpsv+yvbD5Q0YIu?= =?us-ascii?q?jvd0So/mwa64ZxyN2/xhgRfzUJnB7Loc0qyN4/CmBjVLsMbJmUtBWaIPfidNsd?= =?us-ascii?q?8RkQ0kDZzNImzAB9muURYHGt9fXkRu5XCxPBsdMs//Y1rPvi/6tmZKSV3BPAZ4?= =?us-ascii?q?bt74BpTVx5zukbviq9uMOk4Z1HKUWvBbElaflU3prM4YgI9veO4a6yDihT92Qd?= =?us-ascii?q?lQ3n5iPlmJnhzxtY+a9Z9n9DlM6bp6r5YTGfayQ6NtVrFcDTI7I0gp9cbrsl/F?= =?us-ascii?q?VgLJ6XwCAUsMlR8dIQHe6xeybJ70uy2y4uh0wy6cFdX7V741XzWl6eFgTxq+23?= =?us-ascii?q?RPDCIw7GyC0p84t6lcuh/0/xE=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1HGBAA2DxtXb0TcVdFegw2Be7d2gmqBI?= =?us-ascii?q?AgXgXaEAQKBbgEBAQEBAQICDwEKCwwIH4JefVs9AQEBAxIVGQEBNwEPUTQBBQE?= =?us-ascii?q?cGSKICAGgd4ExPjGKT4UoAQSMSQEBAQEBBQIBFwYKhA2NXAtAgkOHeYVfc4lJj?= =?us-ascii?q?hZjiEaFZUWNLDCBDoJaDRsWgUJfAYh6AQEB?= X-IPAS-Result: =?us-ascii?q?A1HGBAA2DxtXb0TcVdFegw2Be7d2gmqBIAgXgXaEAQKBbgE?= =?us-ascii?q?BAQEBAQICDwEKCwwIH4JefVs9AQEBAxIVGQEBNwEPUTQBBQEcGSKICAGgd4ExP?= =?us-ascii?q?jGKT4UoAQSMSQEBAQEBBQIBFwYKhA2NXAtAgkOHeYVfc4lJjhZjiEaFZUWNLDC?= =?us-ascii?q?BDoJaDRsWgUJfAYh6AQEB?= X-IronPort-AV: E=Sophos;i="5.24,520,1454976000"; d="scan'208";a="15548863" Received: from emvm-gh1-uea09.nsa.gov ([10.208.42.194]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-SHA; 23 Apr 2016 06:05:35 +0000 X-TM-IMSS-Message-ID: Received: from mail-pa0-f68.google.com (mail-pa0-f68.google.com [209.85.220.68]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id b0ad94140000642e ; Sat, 23 Apr 2016 02:05:07 -0400 Received: by mail-pa0-f68.google.com with SMTP id zy2so12078816pac.2 for ; Fri, 22 Apr 2016 23:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xkvuzpma2eOs5cjQ/xpQ0HXbQBdMsBR+mHHt5vstQOA=; b=Zz7Do+usx7wXCzTTfOPmVCMSuM3EO27FEjKZdK6qjPnnnqoZyBgdzeNNeRvw+1Tw0D KNkvJdlbsJOzTtJK5IDWhLBY59sNFGXkZzhshV+mwi0f33XAU0C5EWAB6Vlm47oOkhgl Gf2Uee8qfveBIWuaxrALoNo7XyHVjVN2OTkdAoQuZqidBCzvfAwyJupU6kBlQTTV/mCy CP4pyFg8jZeJ2eEQoLJ6K4X1INq09g7QGNts5H51njdmn0fXKlngstm8SyzcnYxxmXOq EItIpIFBiSjK/Z0EtlUKChmbfpN2zzf3fc5VVFrhGhBIwWQcFO/e0sBmTCBkDma5UL4l 5p6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Xkvuzpma2eOs5cjQ/xpQ0HXbQBdMsBR+mHHt5vstQOA=; b=edvwp9JbEpdE2o+qMEVFpu1BBWPY/nfPeyUYlCJrvhzT9LXPAQYQ3PjfFJJiNWU1dY 5C6xLiANlJU8IKq7Axjeg1APNLrR8oc+8AzVp7wmwYJ7uL7AWuJVoiX7PkluBDsqIVRz UrmR6ICguU+lH63e+7hU8pezsIVpiTNhVkysm6U1WreSMRGY32vJd1vVC25PQNwX+G71 pmv8lnl2AU1GQ/+NPUlwmsBcC0f3QvCuu98zJ+W2WwfTBhxFjUpS7IoIO3Xp4ba+lL7G K2enaDmSeMfKnVz5XnvUiGnZqHaWeqKV9I7XJi8M/WKRooMDGDvcNYYAhhsbmwBeOl+R DPiA== X-Gm-Message-State: AOPr4FVO/b0cm1RwqnL/jeU7k3TNnGyKyHEswcegoTynf5HOJi/L3tRlxgyh5aMWZJgnVg== X-Received: by 10.66.66.10 with SMTP id b10mr34113681pat.12.1461391533544; Fri, 22 Apr 2016 23:05:33 -0700 (PDT) Received: from localhost ([2404:e800:e600:38b:b52d:863:7600:b418]) by smtp.gmail.com with ESMTPSA id s66sm12365467pfi.3.2016.04.22.23.05.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 23:05:32 -0700 (PDT) From: Jason Zaman To: selinux@tycho.nsa.gov Subject: [PATCH v2 4/8] genhomedircon: make all write context funcs take user_entry struct Date: Sat, 23 Apr 2016 14:04:55 +0800 Message-Id: <1461391499-20593-5-git-send-email-jason@perfinion.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461391499-20593-1-git-send-email-jason@perfinion.com> References: <1460131535-15688-1-git-send-email-jason@perfinion.com> <1461391499-20593-1-git-send-email-jason@perfinion.com> X-TM-AS-MML: disable X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jason Zaman --- libsemanage/src/genhomedircon.c | 86 ++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c index 9529020..1a7882c 100644 --- a/libsemanage/src/genhomedircon.c +++ b/libsemanage/src/genhomedircon.c @@ -571,20 +571,23 @@ static int write_replacements(genhomedircon_settings_t * s, FILE * out, } static int write_home_dir_context(genhomedircon_settings_t * s, FILE * out, - semanage_list_t * tpl, const char *user, - const char *seuser, const char *home, - const char *role_prefix, const char *level) + semanage_list_t * tpl, const genhomedircon_user_entry_t *user) { replacement_pair_t repl[] = { - {.search_for = TEMPLATE_SEUSER,.replace_with = seuser}, - {.search_for = TEMPLATE_HOME_DIR,.replace_with = home}, - {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, - {.search_for = TEMPLATE_LEVEL,.replace_with = level}, + {.search_for = TEMPLATE_SEUSER,.replace_with = user->sename}, + {.search_for = TEMPLATE_HOME_DIR,.replace_with = user->home}, + {.search_for = TEMPLATE_ROLE,.replace_with = user->prefix}, + {.search_for = TEMPLATE_LEVEL,.replace_with = user->level}, {NULL, NULL} }; - if (fprintf(out, COMMENT_USER_HOME_CONTEXT, user) < 0) - return STATUS_ERR; + if (strcmp(user->name, FALLBACK_NAME) == 0) { + if (fprintf(out, COMMENT_USER_HOME_CONTEXT, FALLBACK_SENAME) < 0) + return STATUS_ERR; + } else { + if (fprintf(out, COMMENT_USER_HOME_CONTEXT, user->name) < 0) + return STATUS_ERR; + } return write_replacements(s, out, tpl, repl); } @@ -601,13 +604,12 @@ static int write_home_root_context(genhomedircon_settings_t * s, FILE * out, } static int write_user_context(genhomedircon_settings_t * s, FILE * out, - semanage_list_t * tpl, const char *user, - const char *seuser, const char *role_prefix) + semanage_list_t * tpl, const genhomedircon_user_entry_t *user) { replacement_pair_t repl[] = { - {.search_for = TEMPLATE_USER,.replace_with = user}, - {.search_for = TEMPLATE_ROLE,.replace_with = role_prefix}, - {.search_for = TEMPLATE_SEUSER,.replace_with = seuser}, + {.search_for = TEMPLATE_USER,.replace_with = user->name}, + {.search_for = TEMPLATE_ROLE,.replace_with = user->prefix}, + {.search_for = TEMPLATE_SEUSER,.replace_with = user->sename}, {NULL, NULL} }; @@ -692,32 +694,6 @@ static void pop_user_entry(genhomedircon_user_entry_t ** list) free(temp); } -static int set_fallback_user(genhomedircon_settings_t *s, const char *user, - const char *prefix, const char *level) -{ - char *fallback_user = strdup(user); - char *fallback_user_prefix = strdup(prefix); - char *fallback_user_level = NULL; - if (level) - fallback_user_level = strdup(level); - - if (fallback_user == NULL || fallback_user_prefix == NULL || - (fallback_user_level == NULL && level != NULL)) { - free(fallback_user); - free(fallback_user_prefix); - free(fallback_user_level); - return STATUS_ERR; - } - - free(s->fallback_user); - free(s->fallback_user_prefix); - free(s->fallback_user_level); - s->fallback_user = fallback_user; - s->fallback_user_prefix = fallback_user_prefix; - s->fallback_user_level = fallback_user_level; - return STATUS_SUCCESS; -} - static int setup_fallback_user(genhomedircon_settings_t * s) { semanage_seuser_t **seuser_list = NULL; @@ -762,7 +738,8 @@ static int setup_fallback_user(genhomedircon_settings_t * s) level = FALLBACK_LEVEL; } - if (set_fallback_user(s, seuname, prefix, level) != 0) + if (push_user_entry(&(s->fallback), FALLBACK_NAME, 0, 0, + seuname, prefix, "", level) != 0) errors = STATUS_ERR; semanage_user_key_free(key); if (u) @@ -823,7 +800,7 @@ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s, seuname = semanage_seuser_get_sename(seuser_list[i]); name = semanage_seuser_get_name(seuser_list[i]); - if (strcmp(name,"root") && strcmp(seuname, s->fallback_user) == 0) + if (strcmp(name,"root") && strcmp(seuname, s->fallback->sename) == 0) continue; if (strcmp(name, DEFAULT_LOGIN) == 0) @@ -916,13 +893,9 @@ static int write_gen_home_dir_context(genhomedircon_settings_t * s, FILE * out, } for (; users; pop_user_entry(&users)) { - if (write_home_dir_context(s, out, homedir_context_tpl, - users->name, - users->sename, users->home, - users->prefix, users->level)) + if (write_home_dir_context(s, out, homedir_context_tpl, users)) goto err; - if (write_user_context(s, out, user_context_tpl, users->name, - users->sename, users->prefix)) + if (write_user_context(s, out, user_context_tpl, users)) goto err; } @@ -984,13 +957,13 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out) goto done; } - if (write_home_dir_context(s, out, - homedir_context_tpl, - s->fallback_user, s->fallback_user, - ustr_cstr(temp), - s->fallback_user_prefix, s->fallback_user_level) != - STATUS_SUCCESS) { + free(s->fallback->home); + s->fallback->home = (char*) ustr_cstr(temp); + + if (write_home_dir_context(s, out, homedir_context_tpl, + s->fallback) != STATUS_SUCCESS) { ustr_sc_free(&temp); + s->fallback->home = NULL; retval = STATUS_ERR; goto done; } @@ -998,17 +971,18 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out) homeroot_context_tpl, h->data) != STATUS_SUCCESS) { ustr_sc_free(&temp); + s->fallback->home = NULL; retval = STATUS_ERR; goto done; } ustr_sc_free(&temp); + s->fallback->home = NULL; } } if (user_context_tpl) { if (write_user_context(s, out, user_context_tpl, - ".*", s->fallback_user, - s->fallback_user_prefix) != STATUS_SUCCESS) { + s->fallback) != STATUS_SUCCESS) { retval = STATUS_ERR; goto done; }