diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
| commit | de8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch) | |
| tree | 3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /security/selinux | |
| parent | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff) | |
| parent | 171cef6d6ec6c1b4e95f2053545b2dd91931518b (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/ss/ebitmap.c | 2 | ||||
| -rw-r--r-- | security/selinux/ss/policydb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c index 7d10e5d418bb..9db4709a6877 100644 --- a/security/selinux/ss/ebitmap.c +++ b/security/selinux/ss/ebitmap.c @@ -360,7 +360,7 @@ int ebitmap_read(struct ebitmap *e, void *fp) if (mapunit != BITS_PER_U64) { printk(KERN_ERR "SELinux: ebitmap: map size %u does not " - "match my size %Zd (high bit was %d)\n", + "match my size %zd (high bit was %d)\n", mapunit, BITS_PER_U64, e->highbit); goto bad; } diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index d719db4219cd..9c92f29a38ea 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -2266,7 +2266,7 @@ int policydb_read(struct policydb *p, void *fp) len = le32_to_cpu(buf[1]); if (len != strlen(POLICYDB_STRING)) { printk(KERN_ERR "SELinux: policydb string length %d does not " - "match expected length %Zu\n", + "match expected length %zu\n", len, strlen(POLICYDB_STRING)); goto bad; } |