Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d854d2 authored by Paul Moore's avatar Paul Moore
Browse files

selinux: Fix a problem in security_netlbl_sid_to_secattr() 



Currently when SELinux fails to allocate memory in
security_netlbl_sid_to_secattr() the NetLabel LSM domain field is set to
NULL which triggers the default NetLabel LSM domain mapping which may not
always be the desired mapping.  This patch fixes this by returning an error
when the kernel is unable to allocate memory.  This could result in more
failures on a system with heavy memory pressure but it is the "correct"
thing to do.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
parent d8395c87

security/selinux/ss/services.c

+8 −2
Original line number Diff line number Diff line
@@ -2785,7 +2785,7 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr, 
 */

int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr)

{

	int rc = -ENOENT;

	int rc;

	struct context *ctx;



	if (!ss_initialized)
@@ -2793,10 +2793,16 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) 


	read_lock(&policy_rwlock);

	ctx = sidtab_search(&sidtab, sid);

	if (ctx == NULL)

	if (ctx == NULL) {

		rc = -ENOENT;

		goto netlbl_sid_to_secattr_failure;

	}

	secattr->domain = kstrdup(policydb.p_type_val_to_name[ctx->type - 1],

				  GFP_ATOMIC);

	if (secattr->domain == NULL) {

		rc = -ENOMEM;

		goto netlbl_sid_to_secattr_failure;

	}

	secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY;

	mls_export_netlbl_lvl(ctx, secattr);

	rc = mls_export_netlbl_cat(ctx, secattr);