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,USER_AGENT_GIT autolearn=unavailable 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 E9BCEC282E0 for ; Fri, 19 Apr 2019 00:47:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6C4521736 for ; Fri, 19 Apr 2019 00:47:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.com header.i=@yahoo.com header.b="p2wnSP42" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726632AbfDSArF (ORCPT ); Thu, 18 Apr 2019 20:47:05 -0400 Received: from sonic317-33.consmr.mail.bf2.yahoo.com ([74.6.129.88]:43432 "EHLO sonic317-33.consmr.mail.bf2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726803AbfDSArE (ORCPT ); Thu, 18 Apr 2019 20:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1555634823; bh=nhyQ5HEMViXMwzj11P6PbXR0lPC7xmZwGngBq91che4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=p2wnSP422arMtKWJacNqhj701XifV5bmhJJEPkcWCCxU9PxtcVTwgUtwYLQYEHhtX2f+cHWz6a9BhmGBqR/mlbIuCJoCOkMjSZyZ9f1Puq/V2iJs6XJoX91RlZ1WLJ8TYvsWnIfSJ28ujm/sB5bhlEe8L1b4nXVSIJLOPIkuf7hGsuwkllTdJ78XVCAFl+XcKKAl+zpevwHM0sOnipUJBPVsO5kD64K/GHvJHECpgMb/+VoOFWsP75P+5LMtnzcO26u1DgxqLpsVMJ5f6YyWqFg6HgQ29HsdSv9XpFLT2ENUc+sPR2foy1dmEGSaZ2t1Yfp14Gef4HbmTz9GvSW8zw== X-YMail-OSG: dxtd2iQVM1mj8GqA_jdudZCkDg45uVt5siFt.GDhkljxYz6cWpMDsrOz92sIDuJ fbLqmjhyYfzPdpB3rHMJPQZzeQEe77b.nBqsFJc9GVIXC1HqloMGVHuaWsGcYoXC4q1yRRB8xcN1 oChZRmKl5QCe591J.Qox27kg1dLG5YrTYBtwwrG2Hmhs.gr8HCn0eJeTdiRSfAJ7HbUqjGdN1qi3 JwqjVJ4bSegurypPrCNrw8DK33nR.InNYw6DqF29c7cL0E_KKlBWWnKc.KYYjxIbmEWP1CCXNPIz 5433jxBXocClrnKSTOLwapTMBP.QWri0fJvUgVdoicSEI5teJPl4SxhxEY8LcuM_7LnB.utbULux Wh8XgutpVpY7JejKXlfApwOlU_HHwcS_wWNBhyN0hge60tzvFJ0AXFhO_ivRH8xtDTbhDPtjTa80 FPVtKtqOH0xsehsiCF8GPWEYKu67uyysNY6HH9RmnDrT0VDdVR1w8riUPhFpAUZWPNyAq.YVSe5v REXEeQIWKm5SH4yPQPCbwsX5U0yu5PnLOy0kpDqpTpfHN3iHCEASQu1DtOAY3R7B4e2CZfcVL45z EsejtGkTo6a7sIDZKc3OUhCpaKwB6rXQ9Z5Q747x1FQDxMXMHmDFdgCsRfGb3fM7b.e5VLjJ.1En a41fOgPgZ4PGPJR.o7MqNUUjIpSHYjTw5382ijoNxGoYWF7mfh0crU_1k1rYMQSi5euRTJCj9ocq o6t_d0A8LTkv1WoH_Mtievdmyg.EhUhdEzSimN28lpWtLAr90vengIEIil0lsDIQoKFN1xcg4Jed uzenu86o44Oh.XYj2CbtJn8HiadsqAtddsJdsRc5kV2nzO7GKQU3sC2CLoryq_P96.dU2SATBXR2 .wKrGZNGfQURoMXXthwxafLZL9yTCCQOD7GxrRjUXP5VRyG0eS8pl2RmWPfyGzvHDk.PRHHKb6nR BEQ4P.CtJUotpUW6ANlgWXvZ1KCVhudFjXHjbct9d2GbDhUX7Z6WKo7tqdqiR38tE4HibJXKM22d sjgTzRodnfFmiX5sila1aZ8J31Xh1jERxcCnyvlcAdjcrF5a_euzNP9Md3fe3Ukt.c7QPoHQmcDB bUlRWgYm3M1w_kNEd.ekq2LtDsywHWUAfFbbWpquoCqK5LDF1zD4w_NEdkl1fdIDsxZqjrQHuhz2 LIy.Fdr_LFk43CnurObrseTWoU1c- Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.bf2.yahoo.com with HTTP; Fri, 19 Apr 2019 00:47:03 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp404.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 7bfda36ec44e7fd17a13267c14302369; Fri, 19 Apr 2019 00:47:00 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com Subject: [PATCH 17/90] LSM: Use lsm_export in security_secctx_to_secid Date: Thu, 18 Apr 2019 17:45:04 -0700 Message-Id: <20190419004617.64627-18-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190419004617.64627-1-casey@schaufler-ca.com> References: <20190419004617.64627-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