diff options
| author |   Casey Schaufler <casey@schaufler-ca.com> | 2024-10-23 14:21:58 -0700 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2024-12-04 14:59:57 -0500 |
| commit | a4626e978677e3d3e816fdc217d8416c8b9462ae (patch) | |
| tree | 485d2f1f276cb40d726168ee7d2b3ec15b2c9fda | |
| parent | lsm: lsm_context in security_dentry_init_security (diff) | |
| download | wireguard-linux-a4626e978677e3d3e816fdc217d8416c8b9462ae.tar.xz wireguard-linux-a4626e978677e3d3e816fdc217d8416c8b9462ae.zip | |
lsm: secctx provider check on release
Verify that the LSM releasing the secctx is the LSM that
allocated it. This was not necessary when only one LSM could
create a secctx, but once there can be more than one it is.
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
[PM: subject tweak]
Signed-off-by: Paul Moore <paul@paul-moore.com>
| -rw-r--r-- | security/apparmor/secid.c | 13 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/security/apparmor/secid.c b/security/apparmor/secid.c index b08969ec34b7..28caf66b9033 100644 --- a/security/apparmor/secid.c +++ b/security/apparmor/secid.c @@ -108,14 +108,11 @@ int apparmor_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid) void apparmor_release_secctx(struct lsm_context *cp) { - /* - * stacking scaffolding: - * When it is possible for more than one LSM to provide a - * release hook, do this check: - * if (cp->id == LSM_ID_APPARMOR || cp->id == LSM_ID_UNDEF) - */ - - kfree(cp->context); + if (cp->id == LSM_ID_APPARMOR) { + kfree(cp->context); + cp->context = NULL; + cp->id = LSM_ID_UNDEF; + } } /** diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4f8d37ae769a..a2e72f1212a3 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -6672,14 +6672,11 @@ static int selinux_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid) static void selinux_release_secctx(struct lsm_context *cp) { - /* - * stacking scaffolding: - * When it is possible for more than one LSM to provide a - * release hook, do this check: - * if (cp->id == LSM_ID_SELINUX || cp->id == LSM_ID_UNDEF) - */ - - kfree(cp->context); + if (cp->id == LSM_ID_SELINUX) { + kfree(cp->context); + cp->context = NULL; + cp->id = LSM_ID_UNDEF; + } } static void selinux_inode_invalidate_secctx(struct inode *inode) |