From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6EC5C10F0E for ; Tue, 9 Apr 2019 19:19:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73FAB2084F for ; Tue, 9 Apr 2019 19:19:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="ZC4TAQHh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726778AbfDITTL (ORCPT ); Tue, 9 Apr 2019 15:19:11 -0400 Received: from sonic313-26.consmr.mail.gq1.yahoo.com ([98.137.65.89]:46316 "EHLO sonic313-26.consmr.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726818AbfDITTL (ORCPT ); Tue, 9 Apr 2019 15:19:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1554837549; bh=nhyQ5HEMViXMwzj11P6PbXR0lPC7xmZwGngBq91che4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=ZC4TAQHh7dE3hCyXb+w7tHghKfcSnXv1iCQ1DcKFUl3oJm9TkThciQ81H9QkLUFxq3bavI9582CS6byzyxc5AhOUFssfVazI+3zbldeb9uYRBS20xlv0hi6e2c92nW58HfGnW3LAwh3erM6KWDj2l0NJAXeCYir9HGEx8lYpbr0lYSY0OJZy9m14wktv8WUfx0pjLDBmX/9w+MDTLHDrDdRZiB8yt1uh43h2PI/8mmBAVnPimnBQ7ZDySEERlFlH49sLR93EQIzScBDbHtZy7JUUpf9S6HozKbm1njIAPnatSf29lA5jMA8gaNkmN9+Oa1x0iFPoaq0gymcPbcBcOA== X-YMail-OSG: bnIrBXMVM1kR7HARYK348UzkQWsZCSf9YOiBa7XDSyqXLRxmlwGkmdqQ3PhOT3r ASPCB5EefRE_ecnzdNACUIxFbINbS8uqx31oXIDRfybExtaFROUK7.thRdm.aW6PzBF293Lys.BP UikTqr4HbvGvOQw5T9qbOMSXBZFHrj0LS6dsUHBrAHL1gz.AA2uLIXrjPyQ0ApmnUF1MZ6hs4sAP TSzwtlWv2NwTXRP5JQ.br1O17PybBMnkyUIwzn_V8DogIkC3Wrd6na6vwAOxTGgE6VGQlWV5HGby F66zuPEWJTk_eAKZog5nvT9VwU1u6wE8a5r5ObpvmVB0Q1btlqa04w7.ax0UHYmCYuNS_kKOMWjc tNBdm7y9Yuu9qwEiWOabxq8wJU5bcrx9P5615ASgQGP60gJIituvLb8hkz4UcF_g_YqJlxrCEoeD uk5JxTKi5gNNEfN8Ix1kRlV0x8gBVHNUsl3qFsKf5RbonGA3Ml7dEr3o7.K6NTiC8lEXhMXPeCKH 0pJmt79LeZE0Xf7SkBpUs3Zt9h.SgPusXC_McYn89XhmWuxvsJzRz2_Y9T4..CsHa1WAOl86izKL Gn61OJ1pkRZ_ZA6yp0XK5URLqCLo5dMT0hm4lZiLEu_3LDXofvWC7wdqz2K6abbrPFwv3O7_4GFa xz84VAiW3DCYh9fGFFhm_ssAVXGBhDFvfrOoOxecgJ8oruhUg_y_ipWYDIb8K4Jhc1GLnogQkvM6 gWY.nvC_xmmDisPItbBl9eCF30Q32486KiLLDnb1Gf_gBkeXX3uf4MKv4lj5N29hJlP_YxxgetFM tcJt817qnI6_z4kEHIFzS_.eaPnQg2ZwBLl5czW7KxOLeK0F_z5xMblupcU0qTM1o296RBB_jPU8 3PXnYFMMZ9PioOMU6MFFTzddzjaXZC3uF3hIKMKikYYGWIhItsAZrV.9ZIibniH5tWcTCjBFf6th 0sN1fP1CNkKQttEDOaI0vR6QdsX0qtH.8Rpa0EGFmKXRyJGOzYAPhqxMnD.5ILgDz4lspl2lDA8i 1srcozEA7uVuLclolF0DIrE23cQo0FgizA.OniE8gez3fzqtfZsH.Ucwhrtk6K8UZ_EUIcVoKN0f IuSR4t7r.tyyO6z__kb3i9ncUurwPdyyMmeZu21o_u8pjMHEh3DTqV7HLU8_uoBQsxjbkAg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Tue, 9 Apr 2019 19:19:09 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp401.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 54e8f28a4675c25365c7725d1b772c7b; Tue, 09 Apr 2019 19:19:05 +0000 (UTC) From: Casey Schaufler To: jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, casey.schaufler@intel.com Cc: keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH 17/59] LSM: Use lsm_export in security_secctx_to_secid Date: Tue, 9 Apr 2019 12:18:06 -0700 Message-Id: <20190409191848.1380-18-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190409191848.1380-1-casey@schaufler-ca.com> References: <20190409191848.1380-1-casey@schaufler-ca.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Convert security_secctx_to_secid to use the lsm_export structure instead of a u32 secid. There is some scaffolding involved that will be removed when the related data is updated. Signed-off-by: Casey Schaufler --- include/linux/security.h | 5 +++-- kernel/cred.c | 4 +--- net/netfilter/nft_meta.c | 4 +++- net/netfilter/xt_SECMARK.c | 5 +++-- net/netlabel/netlabel_unlabeled.c | 8 ++++++-- security/security.c | 11 ++++------- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index e3f5c61b9b2c..991d2d2e290e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -437,7 +437,8 @@ int security_setprocattr(const char *lsm, const char *name, void *value, int security_netlink_send(struct sock *sk, struct sk_buff *skb); int security_ismaclabel(const char *name); int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen); -int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid); +int security_secctx_to_secid(const char *secdata, u32 seclen, + struct lsm_export *l); void security_release_secctx(char *secdata, u32 seclen); void security_inode_invalidate_secctx(struct inode *inode); @@ -1220,7 +1221,7 @@ static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *secle static inline int security_secctx_to_secid(const char *secdata, u32 seclen, - u32 *secid) + struct lsm_export *l) { return -EOPNOTSUPP; } diff --git a/kernel/cred.c b/kernel/cred.c index 40a3fde22667..7792538b1ca6 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -725,14 +725,12 @@ EXPORT_SYMBOL(set_security_override); int set_security_override_from_ctx(struct cred *new, const char *secctx) { struct lsm_export le; - u32 secid; int ret; - ret = security_secctx_to_secid(secctx, strlen(secctx), &secid); + ret = security_secctx_to_secid(secctx, strlen(secctx), &le); if (ret < 0) return ret; - lsm_export_to_all(&le, secid); return set_security_override(new, &le); } EXPORT_SYMBOL(set_security_override_from_ctx); diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 987d2d6ce624..598bea8e4799 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -576,13 +576,15 @@ static const struct nla_policy nft_secmark_policy[NFTA_SECMARK_MAX + 1] = { static int nft_secmark_compute_secid(struct nft_secmark *priv) { + struct lsm_export le; u32 tmp_secid = 0; int err; - err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &tmp_secid); + err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &le); if (err) return err; + lsm_export_secid(&le, &tmp_secid); if (!tmp_secid) return -ENOENT; diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c index f16202d26c20..2def8d8898e6 100644 --- a/net/netfilter/xt_SECMARK.c +++ b/net/netfilter/xt_SECMARK.c @@ -49,13 +49,13 @@ secmark_tg(struct sk_buff *skb, const struct xt_action_param *par) static int checkentry_lsm(struct xt_secmark_target_info *info) { + struct lsm_export le; int err; info->secctx[SECMARK_SECCTX_MAX - 1] = '\0'; info->secid = 0; - err = security_secctx_to_secid(info->secctx, strlen(info->secctx), - &info->secid); + err = security_secctx_to_secid(info->secctx, strlen(info->secctx), &le); if (err) { if (err == -EINVAL) pr_info_ratelimited("invalid security context \'%s\'\n", @@ -63,6 +63,7 @@ static int checkentry_lsm(struct xt_secmark_target_info *info) return err; } + lsm_export_secid(&le, &info->secid); if (!info->secid) { pr_info_ratelimited("unable to map security context \'%s\'\n", info->secctx); diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index c92894c3e40a..fc38934ccb35 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c @@ -896,6 +896,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb, void *mask; u32 addr_len; u32 secid; + struct lsm_export le; struct netlbl_audit audit_info; /* Don't allow users to add both IPv4 and IPv6 addresses for a @@ -919,10 +920,11 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb, ret_val = security_secctx_to_secid( nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]), nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]), - &secid); + &le); if (ret_val != 0) return ret_val; + lsm_export_secid(&le, &secid); return netlbl_unlhsh_add(&init_net, dev_name, addr, mask, addr_len, secid, &audit_info); @@ -947,6 +949,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb, void *mask; u32 addr_len; u32 secid; + struct lsm_export le; struct netlbl_audit audit_info; /* Don't allow users to add both IPv4 and IPv6 addresses for a @@ -968,10 +971,11 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb, ret_val = security_secctx_to_secid( nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]), nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]), - &secid); + &le); if (ret_val != 0) return ret_val; + lsm_export_secid(&le, &secid); return netlbl_unlhsh_add(&init_net, NULL, addr, mask, addr_len, secid, &audit_info); diff --git a/security/security.c b/security/security.c index d8300a6400c3..868e9ae6b48c 100644 --- a/security/security.c +++ b/security/security.c @@ -1967,14 +1967,11 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) } EXPORT_SYMBOL(security_secid_to_secctx); -int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid) +int security_secctx_to_secid(const char *secdata, u32 seclen, + struct lsm_export *l) { - struct lsm_export data = { .flags = LSM_EXPORT_NONE }; - int rc; - - rc = call_int_hook(secctx_to_secid, 0, secdata, seclen, &data); - lsm_export_secid(&data, secid); - return rc; + lsm_export_init(l); + return call_int_hook(secctx_to_secid, 0, secdata, seclen, l); } EXPORT_SYMBOL(security_secctx_to_secid); -- 2.19.1