Convert security_secctx_to_secid to use the lsm_context structure
instead of a context/secid pair. There is some scaffolding involved
that will be removed when the related data is updated.
Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
---
include/linux/security.h | 6 ++----
kernel/cred.c | 5 ++++-
net/netfilter/nft_meta.c | 5 ++++-
net/netfilter/xt_SECMARK.c | 5 ++++-
net/netlabel/netlabel_unlabeled.c | 16 ++++++++--------
security/security.c | 8 ++------
6 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/include/linux/security.h b/include/linux/security.h
index 2d948f1104cb..23b776bc16bf 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -429,8 +429,7 @@ 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(struct lsm_export *l, char **secdata, u32 *seclen);
-int security_secctx_to_secid(const char *secdata, u32 seclen,
- struct lsm_export *l);
+int security_secctx_to_secid(struct lsm_context *cp, struct lsm_export *l);
void security_release_secctx(char *secdata, u32 seclen);
void security_inode_invalidate_secctx(struct inode *inode);
@@ -1203,8 +1202,7 @@ static inline int security_secid_to_secctx(struct lsm_export *l,
return -EOPNOTSUPP;
}
-static inline int security_secctx_to_secid(const char *secdata,
- u32 seclen,
+static inline int security_secctx_to_secid(struct lsm_context *cp,
struct lsm_export *l)
{
return -EOPNOTSUPP;
diff --git a/kernel/cred.c b/kernel/cred.c
index 7792538b1ca6..ebae67fdd4d0 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -724,10 +724,13 @@ EXPORT_SYMBOL(set_security_override);
*/
int set_security_override_from_ctx(struct cred *new, const char *secctx)
{
+ struct lsm_context lc;
struct lsm_export le;
int ret;
- ret = security_secctx_to_secid(secctx, strlen(secctx), &le);
+ lc.context = secctx;
+ lc.len = strlen(secctx);
+ ret = security_secctx_to_secid(&lc, &le);
if (ret < 0)
return ret;
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 9f5040140fe0..ad1aa430f733 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -565,11 +565,14 @@ 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;
+ struct lsm_context lc;
u32 tmp_secid = 0;
int err;
lsm_export_init(&le);
- err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &le);
+ lc.context = priv->ctx;
+ lc.len = strlen(priv->ctx);
+ err = security_secctx_to_secid(&lc, &le);
if (err)
return err;
diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index 9a2a97c200a2..a06e50535194 100644
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -50,13 +50,16 @@ 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;
+ struct lsm_context lc;
int err;
info->secctx[SECMARK_SECCTX_MAX - 1] = '\0';
info->secid = 0;
lsm_export_init(&le);
- err = security_secctx_to_secid(info->secctx, strlen(info->secctx), &le);
+ lc.context = info->secctx;
+ lc.len = strlen(info->secctx);
+ err = security_secctx_to_secid(&lc, &le);
if (err) {
if (err == -EINVAL)
pr_info_ratelimited("invalid security context \'%s\'\n",
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 934667e8969c..314528bca31c 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -894,6 +894,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
void *mask;
u32 addr_len;
struct lsm_export le;
+ struct lsm_context lc;
struct netlbl_audit audit_info;
/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -914,10 +915,9 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
if (ret_val != 0)
return ret_val;
dev_name = nla_data(info->attrs[NLBL_UNLABEL_A_IFACE]);
- ret_val = security_secctx_to_secid(
- nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]),
- nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]),
- &le);
+ lc.context = nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]);
+ lc.len = nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]);
+ ret_val = security_secctx_to_secid(&lc, &le);
if (ret_val != 0)
return ret_val;
@@ -945,6 +945,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
void *mask;
u32 addr_len;
struct lsm_export le;
+ struct lsm_context lc;
struct netlbl_audit audit_info;
/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -963,10 +964,9 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
ret_val = netlbl_unlabel_addrinfo_get(info, &addr, &mask, &addr_len);
if (ret_val != 0)
return ret_val;
- ret_val = security_secctx_to_secid(
- nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]),
- nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]),
- &le);
+ lc.context = nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]);
+ lc.len = nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]);
+ ret_val = security_secctx_to_secid(&lc, &le);
if (ret_val != 0)
return ret_val;
diff --git a/security/security.c b/security/security.c
index fd1ce1116969..dadb1cb72920 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1988,15 +1988,11 @@ int security_secid_to_secctx(struct lsm_export *l, char **secdata, u32 *seclen)
}
EXPORT_SYMBOL(security_secid_to_secctx);
-int security_secctx_to_secid(const char *secdata, u32 seclen,
- struct lsm_export *l)
+int security_secctx_to_secid(struct lsm_context *cp, struct lsm_export *l)
{
- struct lsm_context lc;
- lc.context = secdata;
- lc.len = seclen;
lsm_export_init(l);
- return call_one_int_hook(secctx_to_secid, 0, &lc, l);
+ return call_one_int_hook(secctx_to_secid, 0, cp, l);
}
EXPORT_SYMBOL(security_secctx_to_secid);
--
2.17.0
