diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-02-23 22:40:16 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-02-23 22:40:16 -0500 |
| commit | e4e027ea2d7a59819a0384c2d1031aafc5833903 (patch) | |
| tree | 5a2a6b6966b2c6d038e19dcd4a7b3c4c2d8ce94f /security | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| parent | 9085a6422900092886da8c404e1c5340c4ff1cbf (diff) | |
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.c | 8 |
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) | |||
| 3338 | if (rc) | 3338 | if (rc) |
| 3339 | return rc; | 3339 | return rc; |
| 3340 | 3340 | ||
| 3341 | buf[0] = ft->stype; | 3341 | buf[0] = cpu_to_le32(ft->stype); |
| 3342 | buf[1] = ft->ttype; | 3342 | buf[1] = cpu_to_le32(ft->ttype); |
| 3343 | buf[2] = ft->tclass; | 3343 | buf[2] = cpu_to_le32(ft->tclass); |
| 3344 | buf[3] = otype->otype; | 3344 | buf[3] = cpu_to_le32(otype->otype); |
| 3345 | 3345 | ||
| 3346 | rc = put_entry(buf, sizeof(u32), 4, fp); | 3346 | rc = put_entry(buf, sizeof(u32), 4, fp); |
| 3347 | if (rc) | 3347 | if (rc) |