diff options
| author |   Paul Moore <pmoore@redhat.com> | 2013-09-18 13:52:20 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-09-18 13:52:20 -0400 |
| commit | 98f700f317967d45cf60c9843b3c42ce3c286f7c (patch) | |
| tree | 2e68b189ceb954182af56b8f6febe644119b7cd7 /security/selinux/ss/policydb.c | |
| parent | Linux 3.11 (diff) | |
| parent | Revert "SELinux: do not handle seclabel as a special flag" (diff) | |
| download | linux-dev-98f700f317967d45cf60c9843b3c42ce3c286f7c.tar.xz linux-dev-98f700f317967d45cf60c9843b3c42ce3c286f7c.zip | |
Merge git://git.infradead.org/users/eparis/selinux
Conflicts:
security/selinux/hooks.c
Pull Eric's existing SELinux tree as there are a number of patches in
there that are not yet upstream. There was some minor fixup needed to
resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts()
between the labeled NFS patches and Eric's security_fs_use()
simplification patch.
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index c8adde3aff8f..f6195ebde3c9 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -3203,9 +3203,8 @@ static int range_write_helper(void *key, void *data, void *ptr) static int range_write(struct policydb *p, void *fp) { - size_t nel; __le32 buf[1]; - int rc; + int rc, nel; struct policy_data pd; pd.p = p; |