dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Jeff Layton 2012-11-25 08:00:38 -05:00 committed by Steve French
parent 30c9d6cca5
commit ee13b2ba74
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/cifs/cifsacl.c
View File

@ -199,27 +199,24 @@ static void
sid_to_str(struct cifs_sid *sidptr, char *sidstr) sid_to_str(struct cifs_sid *sidptr, char *sidstr)
{ {
int i; int i;
unsigned long saval; unsigned int saval;
char *strptr; char *strptr;
strptr = sidstr; strptr = sidstr;
sprintf(strptr, "%s", "S"); sprintf(strptr, "S-%hhu", sidptr->revision);
strptr = sidstr + strlen(sidstr);
sprintf(strptr, "-%d", sidptr->revision);
strptr = sidstr + strlen(sidstr); strptr = sidstr + strlen(sidstr);
for (i = 0; i < NUM_AUTHS; ++i) { for (i = 0; i < NUM_AUTHS; ++i) {
if (sidptr->authority[i]) { if (sidptr->authority[i]) {
sprintf(strptr, "-%d", sidptr->authority[i]); sprintf(strptr, "-%hhu", sidptr->authority[i]);
strptr = sidstr + strlen(sidstr); strptr = sidstr + strlen(sidstr);
} }
} }
for (i = 0; i < sidptr->num_subauth; ++i) { for (i = 0; i < sidptr->num_subauth; ++i) {
saval = le32_to_cpu(sidptr->sub_auth[i]); saval = le32_to_cpu(sidptr->sub_auth[i]);
sprintf(strptr, "-%ld", saval); sprintf(strptr, "-%u", saval);
strptr = sidstr + strlen(sidstr); strptr = sidstr + strlen(sidstr);
} }
} }