Commit 6bdf3678 authored Apr 29, 2015 by Jeff Vander Stoep Committed by Jeffrey Vander Stoep Apr 29, 2015

SELinux: ss: Fix policy write for ioctl operations



Security server omits the type field when writing out the contents of the
avtab from /sys/fs/selinux/policy. This leads to a corrupt output. No impact
on the running kernel or its loaded policy. Impacts CTS neverallow tests.

Bug: 20665861
Change-Id: I657e18013dd5a1f40052bc2b02dd8e0afee9bcfb
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
(cherry picked from commit 8cdfb356b51e29494ca0b9e4e86727d6f841a52d)

parent 246667e8

security/selinux/ss/avtab.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -565,6 +565,9 @@ int avtab_write_item(struct policydb p, struct avtab_node cur, void *fp)
		return rc;

		if (cur->key.specified & AVTAB_OP) {
		rc = put_entry(&cur->datum.u.ops->type, sizeof(u8), 1, fp);
		if (rc)
		return rc;
		for (i = 0; i < ARRAY_SIZE(cur->datum.u.ops->op.perms); i++)
		buf32[i] = cpu_to_le32(cur->datum.u.ops->op.perms[i]);
		rc = put_entry(buf32, sizeof(u32),