diff options
author | Steve French <sfrench@us.ibm.com> | 2011-05-27 11:19:12 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-27 11:19:12 -0400 |
commit | 383c55350fb4ab6bd08abfab82038ae0364f1f48 (patch) | |
tree | 1e390d83133414f08cf15490027c50f02c257d1a | |
parent | 96daf2b09178d8ebde2b0d56b027de917c17dfdf (diff) |
[CIFS] Fix endian error comparing authusers when cifsacl enabled
Fix sparse warning:
CHECK fs/cifs/cifsacl.c
fs/cifs/cifsacl.c:41:36: warning: incorrect type in initializer
(different base types)
fs/cifs/cifsacl.c:41:36: expected restricted __le32
fs/cifs/cifsacl.c:41:36: got int
fs/cifs/cifsacl.c:461:52: warning: restricted __le32 degrades to integer
fs/cifs/cifsacl.c:461:73: warning: restricted __le32 degrades to integer
The second one looks harmless but the first one (sid_authusers)
was added in commit 2fbc2f1729e785a7b2faf9d8d60926bb1ff62af0
and only affects 2.6.38/2.6.39
CC: Stable <stable@kernel.org>
Reviewed-and-Tested-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/cifsacl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 076b69ceef7f..5f02b4ee9a03 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c | |||
@@ -38,7 +38,7 @@ static const struct cifs_sid sid_everyone = { | |||
38 | 1, 1, {0, 0, 0, 0, 0, 1}, {0} }; | 38 | 1, 1, {0, 0, 0, 0, 0, 1}, {0} }; |
39 | /* security id for Authenticated Users system group */ | 39 | /* security id for Authenticated Users system group */ |
40 | static const struct cifs_sid sid_authusers = { | 40 | static const struct cifs_sid sid_authusers = { |
41 | 1, 1, {0, 0, 0, 0, 0, 5}, {11} }; | 41 | 1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(11)} }; |
42 | /* group users */ | 42 | /* group users */ |
43 | static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; | 43 | static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; |
44 | 44 | ||
@@ -458,7 +458,8 @@ int compare_sids(const struct cifs_sid *ctsid, const struct cifs_sid *cwsid) | |||
458 | if (num_subauth) { | 458 | if (num_subauth) { |
459 | for (i = 0; i < num_subauth; ++i) { | 459 | for (i = 0; i < num_subauth; ++i) { |
460 | if (ctsid->sub_auth[i] != cwsid->sub_auth[i]) { | 460 | if (ctsid->sub_auth[i] != cwsid->sub_auth[i]) { |
461 | if (ctsid->sub_auth[i] > cwsid->sub_auth[i]) | 461 | if (le32_to_cpu(ctsid->sub_auth[i]) > |
462 | le32_to_cpu(cwsid->sub_auth[i])) | ||
462 | return 1; | 463 | return 1; |
463 | else | 464 | else |
464 | return -1; | 465 | return -1; |