Skip to contentSkip to conversation

cifs: fix compiler warning on 64-bit arch-s

PATCH Applied Jan Beulich 3 participants 3 messages Jul 18, 2008 – Jul 22, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: fix compiler warning on 64-bit arch-s

---
 fs/cifs/asn1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/asn1.c +1 -1
@@ -400,7 +400,7 @@ asn1_oid_decode(struct asn1_ctx *ctx,
 	size = eoc - ctx->pointer + 1;
 
 	/* first subid actually encodes first two subids */
-	if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
+	if (size < 2 || size > UINT_MAX/sizeof(unsigned long))
 		return 0;
 
 	*oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
#1 lore raw
Quoted 11 lines · Jan Beulich
---
 fs/cifs/asn1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

fs/cifs/asn1.c asn1_oid_decode(struct asn1_ctx *ctx, · line 406

Quoted 8 lines
fs/cifs/asn1.c +1 -1
@@ -400,7 +400,7 @@ asn1_oid_decode(struct asn1_ctx *ctx,
 	size = eoc - ctx->pointer + 1;
 
 	/* first subid actually encodes first two subids */
-	if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
+	if (size < 2 || size > UINT_MAX/sizeof(unsigned long))
 		return 0;
 
 	*oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);

I did see the following patch from David Howells attempting to fix the same warning posted a little earlier.

Fix the CIFS range check to always use a big enough size variable that the compiler won't moan about comparing it to ULONG_MAX/8 on a 64-bit platform.

---

 fs/cifs/asn1.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/cifs/asn1.c +1 -1
index f58e41d..512587d 100644
@@ -394,8 +394,8 @@ asn1_oid_decode(struct asn1_ctx *ctx,
 		unsigned char *eoc, unsigned long **oid, unsigned int *len)
 {
 	unsigned long subid;
-	unsigned int size;
 	unsigned long *optr;
+	size_t size;
 
 	size = eoc - ctx->pointer + 1;
 

Thanks,

Signature · 1 line
Suresh Jayaraman
Applied
#2 lore raw
In reply to Jan Beulich

merged into cifs-2.6.git

Quoted 21 lines · Jan Beulich
---
 fs/cifs/asn1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/asn1.c 2008-07-17 15:23:11.000000000 +0200 renamed from fs/cifs/asn1.c 2008-07-13 23:51:29.000000000 +0200 +1 -1
@@ -400,7 +400,7 @@ asn1_oid_decode(struct asn1_ctx *ctx,
       size = eoc - ctx->pointer + 1;
 
       /* first subid actually encodes first two subids */
-       if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
+       if (size < 2 || size > UINT_MAX/sizeof(unsigned long))
               return 0;
 
       *oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
Signature · 3 lines
Thanks,

Steve