lkml.org 
[lkml]   [2003]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] Fix SELinux format specifiers
From
Date
From:  James Morris <jmorris@redhat.com>

This patch corrects several format specifiers in the SELinux
security server code.

security/selinux/ss/ebitmap.c | 10 +++++-----
security/selinux/ss/policydb.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.5/security/selinux/ss/ebitmap.c
===================================================================
RCS file: /nfshome/pal/CVS/linux-2.5/security/selinux/ss/ebitmap.c,v
retrieving revision 1.11
diff -u -r1.11 ebitmap.c
--- linux-2.5/security/selinux/ss/ebitmap.c 16 Jul 2003 16:55:31 -0000 1.11
+++ linux-2.5/security/selinux/ss/ebitmap.c 25 Aug 2003 16:03:08 -0000
@@ -250,8 +250,8 @@
count = le32_to_cpu(buf[2]);

if (mapsize != MAPSIZE) {
- printk(KERN_ERR "security: ebitmap: map size %d does not "
- "match my size %d (high bit was %d)\n", mapsize,
+ printk(KERN_ERR "security: ebitmap: map size %u does not "
+ "match my size %Zd (high bit was %d)\n", mapsize,
MAPSIZE, e->highbit);
goto out;
}
@@ -261,7 +261,7 @@
}
if (e->highbit & (MAPSIZE - 1)) {
printk(KERN_ERR "security: ebitmap: high bit (%d) is not a "
- "multiple of the map size (%d)\n", e->highbit, MAPSIZE);
+ "multiple of the map size (%Zd)\n", e->highbit, MAPSIZE);
goto bad;
}
l = NULL;
@@ -283,13 +283,13 @@

if (n->startbit & (MAPSIZE - 1)) {
printk(KERN_ERR "security: ebitmap start bit (%d) is "
- "not a multiple of the map size (%d)\n",
+ "not a multiple of the map size (%Zd)\n",
n->startbit, MAPSIZE);
goto bad_free;
}
if (n->startbit > (e->highbit - MAPSIZE)) {
printk(KERN_ERR "security: ebitmap start bit (%d) is "
- "beyond the end of the bitmap (%d)\n",
+ "beyond the end of the bitmap (%Zd)\n",
n->startbit, (e->highbit - MAPSIZE));
goto bad_free;
}
Index: linux-2.5/security/selinux/ss/policydb.c
===================================================================
RCS file: /nfshome/pal/CVS/linux-2.5/security/selinux/ss/policydb.c,v
retrieving revision 1.23
diff -u -r1.23 policydb.c
--- linux-2.5/security/selinux/ss/policydb.c 13 Aug 2003 13:57:03 -0000 1.23
+++ linux-2.5/security/selinux/ss/policydb.c 25 Aug 2003 16:03:08 -0000
@@ -1074,7 +1074,7 @@
len = buf[1];
if (len != strlen(POLICYDB_STRING)) {
printk(KERN_ERR "security: policydb string length %d does not "
- "match expected length %d\n",
+ "match expected length %Zd\n",
len, strlen(POLICYDB_STRING));
goto bad;
}

--
Stephen Smalley <sds@epoch.ncsc.mil>
National Security Agency

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.034 / U:7.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site