summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-02-24 04:40:16 +0100
committerJames Morris <james.l.morris@oracle.com>2014-02-24 04:40:16 +0100
commite4e027ea2d7a59819a0384c2d1031aafc5833903 (patch)
tree5a2a6b6966b2c6d038e19dcd4a7b3c4c2d8ce94f /security
parentLinux 3.14-rc4 (diff)
parentSELinux: bigendian problems with filename trans rules (diff)
downloadlinux-e4e027ea2d7a59819a0384c2d1031aafc5833903.tar.xz
linux-e4e027ea2d7a59819a0384c2d1031aafc5833903.zip
Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus
Diffstat (limited to 'security')
-rw-r--r--security/selinux/ss/policydb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index c0f498842129..9c5cdc2caaef 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -3338,10 +3338,10 @@ static int filename_write_helper(void *key, void *data, void *ptr)
if (rc)
return rc;
- buf[0] = ft->stype;
- buf[1] = ft->ttype;
- buf[2] = ft->tclass;
- buf[3] = otype->otype;
+ buf[0] = cpu_to_le32(ft->stype);
+ buf[1] = cpu_to_le32(ft->ttype);
+ buf[2] = cpu_to_le32(ft->tclass);
+ buf[3] = cpu_to_le32(otype->otype);
rc = put_entry(buf, sizeof(u32), 4, fp);
if (rc)