aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-11-25 08:00:38 -0500
committerSteve French <smfrench@gmail.com>2012-12-05 13:13:11 -0600
commitee13b2ba7488475b47ae8dab2eebc4f5fd6838c5 (patch)
treeb31668b5c4864ad620496b098efc61f407328e2f /fs/cifs
parent30c9d6cca526243abe6c08eb6fa03db9d2b1a630 (diff)
cifs: fix the format specifiers in sid_to_str
The format specifiers are for signed values, but these are unsigned. Given that '-' is a delimiter between fields, I don't think you'd get what you'd expect if you got a value here that would overflow the sign bit. The version and authority fields are 8 bit values so use a "hh" length modifier there. The subauths are 32 bit values, so there's no need to use a "l" length modifier there. Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsacl.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index dd8d3df7429..9adcdb5a100 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -199,27 +199,24 @@ static void
sid_to_str(struct cifs_sid *sidptr, char *sidstr)
{
int i;
- unsigned long saval;
+ unsigned int saval;
char *strptr;
strptr = sidstr;
- sprintf(strptr, "%s", "S");
- strptr = sidstr + strlen(sidstr);
-
- sprintf(strptr, "-%d", sidptr->revision);
+ sprintf(strptr, "S-%hhu", sidptr->revision);
strptr = sidstr + strlen(sidstr);
for (i = 0; i < NUM_AUTHS; ++i) {
if (sidptr->authority[i]) {
- sprintf(strptr, "-%d", sidptr->authority[i]);
+ sprintf(strptr, "-%hhu", sidptr->authority[i]);
strptr = sidstr + strlen(sidstr);
}
}
for (i = 0; i < sidptr->num_subauth; ++i) {
saval = le32_to_cpu(sidptr->sub_auth[i]);
- sprintf(strptr, "-%ld", saval);
+ sprintf(strptr, "-%u", saval);
strptr = sidstr + strlen(sidstr);
}
}