tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: SAUCE: apparmor4.0.0 [18/90]: LSM stacking v39: LSM: Use lsmcontext in security_lsmblob_to_secctx

Browse Source 
BugLink: http://bugs.launchpad.net/bugs/2028253

Replace the (secctx,seclen) pointer pair with a single
lsmcontext pointer to allow return of the LSM identifier
along with the context and context length. This allows
security_release_secctx() to know how to release the
context. Callers have been modified to use or save the
returned data from the new structure.

security_lsmblob_to_secctx() will now return the length value
on success instead of 0.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: netdev@vger.kernel.org
Cc: audit@vger.kernel.org
Cc: netfilter-devel@vger.kernel.org
Cc: Todd Kjos <tkjos@google.com>
(cherry picked from commit b2a3a4be21bfc71ee961103fb2d638ebc031541e
https://git.launchpad.net/~apparmor-dev/ubuntu-kernel-next)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Casey Schaufler
2023-08-17 12:26:02 -07:00
committed by Paolo Pisati
parent c45f92d3c9
commit 4111e08c80
10 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/lsm_hook_defs.h
+1 -1
View File
@@ -277,7 +277,7 @@ LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size)
LSM_HOOK(int, 0, ismaclabel, const char *name)
LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, struct lsmcontext *cp)
LSM_HOOK(int, -EOPNOTSUPP, lsmblob_to_secctx, struct lsmblob *blob,
char **secdata, u32 *seclen)
struct lsmcontext *cp)
LSM_HOOK(int, 0, secctx_to_secid, const char *secdata, u32 seclen, u32 *secid)
LSM_HOOK(void, LSM_RET_VOID, release_secctx, struct lsmcontext *cp)
LSM_HOOK(void, LSM_RET_VOID, inode_invalidate_secctx, struct inode *inode)
include/linux/security.h
+2 -3
View File
@@ -565,8 +565,7 @@ int security_setprocattr(int lsmid, const char *name, void *value, size_t size);
int security_netlink_send(struct sock *sk, struct sk_buff *skb);
int security_ismaclabel(const char *name);
int security_secid_to_secctx(u32 secid, struct lsmcontext *cp);
int security_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen);
int security_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp);
int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);
void security_release_secctx(struct lsmcontext *cp);
void security_inode_invalidate_secctx(struct inode *inode);
@@ -1503,7 +1502,7 @@ static inline int security_secid_to_secctx(u32 secid, struct lsmcontext *cp)
}
static inline int security_lsmblob_to_secctx(struct lsmblob *blob,
char **secdata, u32 *seclen)
struct lsmcontext *cp)
{
return -EOPNOTSUPP;
}
kernel/audit.c
+4 -5
View File
@@ -1475,9 +1475,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
if (lsmblob_is_set(&audit_sig_lsm)) {
err = security_lsmblob_to_secctx(&audit_sig_lsm,
&lsmctx.context,
&lsmctx.len);
if (err)
&lsmctx);
if (err < 0)
return err;
}
sig_data_size = struct_size(sig_data, ctx, lsmctx.len);
@@ -2192,8 +2191,8 @@ int audit_log_task_context(struct audit_buffer *ab)
if (!lsmblob_is_set(&blob))
return 0;
error = security_lsmblob_to_secctx(&blob, &ctx.context, &ctx.len);
if (error) {
error = security_lsmblob_to_secctx(&blob, &ctx);
if (error < 0) {
if (error != -EINVAL)
goto error_path;
return 0;
kernel/auditsc.c
+6 -11
View File
@@ -1109,7 +1109,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
from_kuid(&init_user_ns, auid),
from_kuid(&init_user_ns, uid), sessionid);
if (lsmblob_is_set(blob)) {
if (security_lsmblob_to_secctx(blob, &ctx.context, &ctx.len)) {
if (security_lsmblob_to_secctx(blob, &ctx) < 0) {
audit_log_format(ab, " obj=(none)");
rc = 1;
} else {
@@ -1370,7 +1370,7 @@ static void audit_log_time(struct audit_context *context, struct audit_buffer **
static void show_special(struct audit_context *context, int *call_panic)
{
struct lsmcontext lsmcxt;
struct lsmcontext lsmctx;
struct audit_buffer *ab;
int i;
@@ -1393,16 +1393,12 @@ static void show_special(struct audit_context *context, int *call_panic)
from_kgid(&init_user_ns, context->ipc.gid),
context->ipc.mode);
if (lsmblob_is_set(&context->ipc.oblob)) {
char *ctx = NULL;
u32 len;
if (security_lsmblob_to_secctx(&context->ipc.oblob,
&ctx, &len)) {
&lsmctx) < 0) {
*call_panic = 1;
} else {
audit_log_format(ab, " obj=%s", ctx);
lsmcontext_init(&lsmcxt, ctx, len, 0);
security_release_secctx(&lsmcxt);
audit_log_format(ab, " obj=%s", lsmctx.context);
security_release_secctx(&lsmctx);
}
}
if (context->ipc.has_perm) {
@@ -1563,8 +1559,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
if (lsmblob_is_set(&n->oblob)) {
struct lsmcontext ctx;
if (security_lsmblob_to_secctx(&n->oblob, &ctx.context,
&ctx.len)) {
if (security_lsmblob_to_secctx(&n->oblob, &ctx) < 0) {
if (call_panic)
*call_panic = 2;
} else {
net/netlabel/netlabel_user.c
+1 -2
View File
@@ -98,8 +98,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,
audit_info->sessionid);
if (lsmblob_is_set(&audit_info->blob) &&
security_lsmblob_to_secctx(&audit_info->blob, &ctx.context,
&ctx.len) == 0) {
security_lsmblob_to_secctx(&audit_info->blob, &ctx) >= 0) {
audit_log_format(audit_buf, " subj=%s", ctx.context);
security_release_secctx(&ctx);
}
security/apparmor/include/secid.h
+1 -2
View File
@@ -26,8 +26,7 @@ extern int apparmor_display_secid_mode;
struct aa_label *aa_secid_to_label(u32 secid);
int apparmor_secid_to_secctx(u32 secid, struct lsmcontext *cp);
int apparmor_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen);
int apparmor_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp);
int apparmor_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);
void apparmor_release_secctx(struct lsmcontext *cp);
security/apparmor/secid.c
+8 -10
View File
@@ -68,8 +68,6 @@ int apparmor_secid_to_secctx(u32 secid, struct lsmcontext *cp)
int flags = FLAG_VIEW_SUBNS | FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT;
int len;
AA_BUG(!seclen);
if (!label)
return -EINVAL;
@@ -93,16 +91,13 @@ int apparmor_secid_to_secctx(u32 secid, struct lsmcontext *cp)
return len;
}
int apparmor_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen)
int apparmor_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp)
{
/* TODO: cache secctx and ref count so we don't have to recreate */
struct aa_label *label;
int flags = FLAG_VIEW_SUBNS | FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT;
int len;
AA_BUG(!seclen);
/* stacking scaffolding */
if (!blob->apparmor.label && blob->scaffold.secid)
label = aa_secid_to_label(blob->scaffold.secid);
@@ -115,8 +110,8 @@ int apparmor_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
if (apparmor_display_secid_mode)
flags |= FLAG_SHOW_MODE;
if (secdata)
len = aa_label_asxprint(secdata, root_ns, label,
if (cp)
len = aa_label_asxprint(&cp->context, root_ns, label,
flags, GFP_ATOMIC);
else
len = aa_label_snxprint(NULL, 0, root_ns, label, flags);
@@ -124,9 +119,12 @@ int apparmor_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
if (len < 0)
return -ENOMEM;
*seclen = len;
if (cp) {
cp->len = len;
cp->id = LSM_ID_APPARMOR;
}
return 0;
return len;
}
int apparmor_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
security/security.c
+11 -13
View File
@@ -4222,30 +4222,28 @@ EXPORT_SYMBOL(security_secid_to_secctx);
/**
* security_lsmblob_to_secctx() - Convert a lsmblob to a secctx
* @blob: lsm specific information
* @secdata: secctx
* @seclen: secctx length
* @cp: the LSM context
*
* Convert a @blob entry to security context. If @secdata is NULL the
* length of the result will be returned in @seclen, but no @secdata
* will be returned. This does mean that the length could change between
* calls to check the length and the next call which actually allocates
* and returns the @secdata.
* Convert a @blob entry to security context. If @cp is NULL the
* length of the result will be returned, but no data will be returned.
* This does mean that the length could change between calls to check
* the length and the next call which actually allocates and returns
* the data.
*
* Return: Return 0 on success, error on failure.
* Return: Return length of data on success, error on failure.
*/
int security_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen)
int security_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp)
{
struct security_hook_list *hp;
int rc;
hlist_for_each_entry(hp, &security_hook_heads.lsmblob_to_secctx, list) {
rc = hp->hook.lsmblob_to_secctx(blob, secdata, seclen);
if (rc != LSM_RET_DEFAULT(secid_to_secctx))
rc = hp->hook.lsmblob_to_secctx(blob, cp);
if (rc != LSM_RET_DEFAULT(lsmblob_to_secctx))
return rc;
}
return LSM_RET_DEFAULT(secid_to_secctx);
return LSM_RET_DEFAULT(lsmblob_to_secctx);
}
EXPORT_SYMBOL(security_lsmblob_to_secctx);
security/selinux/hooks.c
+15 -3
View File
@@ -6639,16 +6639,28 @@ static int selinux_secid_to_secctx(u32 secid, struct lsmcontext *cp)
return seclen;
}
static int selinux_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen)
static int selinux_lsmblob_to_secctx(struct lsmblob *blob,
struct lsmcontext *cp)
{
u32 secid = blob->selinux.secid;
u32 seclen;
u32 ret;
/* stacking scaffolding */
if (!secid)
secid = blob->scaffold.secid;
return security_sid_to_context(secid, secdata, seclen);
if (cp) {
cp->id = LSM_ID_SELINUX;
ret = security_sid_to_context(secid, &cp->context, &cp->len);
if (ret < 0)
return ret;
return cp->len;
}
ret = security_sid_to_context(secid, NULL, &seclen);
if (ret < 0)
return ret;
return seclen;
}
static int selinux_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
security/smack/smack_lsm.c
+10 -6
View File
@@ -4840,19 +4840,23 @@ static int smack_secid_to_secctx(u32 secid, struct lsmcontext *cp)
*
* Exists for audit code.
*/
static int smack_lsmblob_to_secctx(struct lsmblob *blob, char **secdata,
u32 *seclen)
static int smack_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp)
{
struct smack_known *skp = blob->smack.skp;
int len;
/* stacking scaffolding */
if (!skp && blob->scaffold.secid)
skp = smack_from_secid(blob->scaffold.secid);
if (secdata)
*secdata = skp->smk_known;
*seclen = strlen(skp->smk_known);
return 0;
len = strlen(skp->smk_known);
if (cp) {
cp->context = skp->smk_known;
cp->len = len;
cp->id = LSM_ID_SMACK;
}
return len;
}
/**