diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2015-04-29 11:14:23 -0700 |
|---|---|---|
| committer | Jeffrey Vander Stoep <jeffv@google.com> | 2015-04-29 19:38:36 +0000 |
| commit | 6bdf36786e225facf5ad2ed383a29ffd488e60ac (patch) | |
| tree | a53ea0f3bce8eee7d48e786409c25f72136b2deb | |
| parent | 246667e899473fece2c7ae7579943ca94a3acdb0 (diff) | |
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 2e4ff003abcd..dd7466cb2021 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), |