diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2015-04-29 11:14:23 -0700 |
|---|---|---|
| committer | Mohammed Habibulla <moch@google.com> | 2015-10-26 10:27:19 -0700 |
| commit | 8c342cec1baa95529a2160d1431b6e12ed852fe1 (patch) | |
| tree | 79754369ed792cf542d4a39ff1f54cf8cf92f852 | |
| parent | da1c65934bfe6261d964f45154c6cf9d752b968a (diff) | |
| download | pxa-v3.14-8c342cec1baa95529a2160d1431b6e12ed852fe1.tar.gz | |
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)
| -rw-r--r-- | security/selinux/ss/avtab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 2e4ff003abc..dd7466cb202 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c @@ -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), |