cifs: fix the format specifiers in sid_to_str
authorJeff Layton <jlayton@redhat.com>
Sun, 25 Nov 2012 13:00:38 +0000 (08:00 -0500)
committerSteve French <smfrench@gmail.com>
Wed, 5 Dec 2012 19:13:11 +0000 (13:13 -0600)
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>
fs/cifs/cifsacl.c

index dd8d3df74298dafe825a6b446abfa7faaf97a576..9adcdb5a10013477627ec493b730b30d84d9c953 100644 (file)
@@ -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);
        }
 }