2008-07-18 12:17:37

by Jan Beulich

Subject: [PATCH] nf_nat_snmp_basic: fix compiler warning on 64-bit arch-s

Signed-off-by: Jan Beulich <[email protected]>

---
net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.26/net/ipv4/netfilter/nf_nat_snmp_basic.c 2008-07-13 23:51:29.000000000 +0200
+++ 2.6.26-netfilter-warning/net/ipv4/netfilter/nf_nat_snmp_basic.c 2008-07-15 14:51:28.000000000 +0200
@@ -445,7 +445,7 @@ static unsigned char asn1_oid_decode(str
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);

2008-07-18 17:57:50

by Patrick McHardy

Subject: Re: [PATCH] nf_nat_snmp_basic: fix compiler warning on 64-bit arch-s

Jan Beulich wrote:
> Signed-off-by: Jan Beulich <[email protected]>
>
> ---
> net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2.6.26/net/ipv4/netfilter/nf_nat_snmp_basic.c 2008-07-13 23:51:29.000000000 +0200
> +++ 2.6.26-netfilter-warning/net/ipv4/netfilter/nf_nat_snmp_basic.c 2008-07-15 14:51:28.000000000 +0200
> @@ -445,7 +445,7 @@ static unsigned char asn1_oid_decode(str
> 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))

Thanks, I already have a similar fix queued.