Commit a4626e97 authored by Casey Schaufler's avatar Casey Schaufler Committed by Paul Moore
Browse files

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: default avatarCasey Schaufler <casey@schaufler-ca.com>
[PM: subject tweak]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent b530104f

security/apparmor/secid.c

+5 −8
Original line number Diff line number Diff line
@@ -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)

	 */



	if (cp->id == LSM_ID_APPARMOR) {

		kfree(cp->context);

		cp->context = NULL;

		cp->id = LSM_ID_UNDEF;

	}

}



/**

security/selinux/hooks.c

+5 −8
Original line number Diff line number Diff line
@@ -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)

	 */



	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)