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

Commit d210baf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: memory leak in security_context_to_sid_core
parents 3e25a2d9 8e531af9

security/selinux/ss/services.c

+3 −3
Original line number Diff line number Diff line
@@ -811,11 +811,12 @@ static int string_to_context_struct(struct policydb *pol, 
	/* Check the validity of the new context. */

	if (!policydb_context_isvalid(pol, ctx)) {

		rc = -EINVAL;

		context_destroy(ctx);

		goto out;

	}

	rc = 0;

out:

	if (rc)

		context_destroy(ctx);

	return rc;

}
@@ -868,7 +869,6 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len, 
	} else if (rc)

		goto out;

	rc = sidtab_context_to_sid(&sidtab, &context, sid);

	if (rc)

	context_destroy(&context);

out:

	read_unlock(&policy_rwlock);