From b0cd3e2516e8923403955f31799bc11b7b5db62b Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 4 Dec 2007 23:25:26 -0800 Subject: [PATCH] --- yaml --- r: 78283 b: refs/heads/master c: 9e67d5a739327c44885adebb4f3a538050be73e4 h: refs/heads/master i: 78281: b8e1f7a84e74335d233d2bebb43ca0d4d75bb6dc 78279: 3ecdaab4d0c2c98f7847a61ad356e0d11d2c8645 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/arp_tables.c | 2 -- trunk/net/ipv4/netfilter/ip_tables.c | 2 -- trunk/net/ipv6/netfilter/ip6_tables.c | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a7678a7edce2..b3e9bf0ff715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 259d4e41f3ec25f22169daece42729f597b89f9a +refs/heads/master: 9e67d5a739327c44885adebb4f3a538050be73e4 diff --git a/trunk/net/ipv4/netfilter/arp_tables.c b/trunk/net/ipv4/netfilter/arp_tables.c index a21722d5c9fa..d5cae7e906cf 100644 --- a/trunk/net/ipv4/netfilter/arp_tables.c +++ b/trunk/net/ipv4/netfilter/arp_tables.c @@ -811,8 +811,6 @@ static int do_replace(void __user *user, unsigned int len) return -ENOPROTOOPT; /* overflow check */ - if (tmp.size >= INT_MAX / num_possible_cpus()) - return -ENOMEM; if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters)) return -ENOMEM; diff --git a/trunk/net/ipv4/netfilter/ip_tables.c b/trunk/net/ipv4/netfilter/ip_tables.c index 87d369244bd9..64ffe57ef1b3 100644 --- a/trunk/net/ipv4/netfilter/ip_tables.c +++ b/trunk/net/ipv4/netfilter/ip_tables.c @@ -1323,8 +1323,6 @@ do_replace(void __user *user, unsigned int len) return -ENOPROTOOPT; /* overflow check */ - if (tmp.size >= INT_MAX / num_possible_cpus()) - return -ENOMEM; if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters)) return -ENOMEM; diff --git a/trunk/net/ipv6/netfilter/ip6_tables.c b/trunk/net/ipv6/netfilter/ip6_tables.c index e60c1b4b1ec8..d3e884a5c6a8 100644 --- a/trunk/net/ipv6/netfilter/ip6_tables.c +++ b/trunk/net/ipv6/netfilter/ip6_tables.c @@ -1042,8 +1042,6 @@ do_replace(void __user *user, unsigned int len) return -EFAULT; /* overflow check */ - if (tmp.size >= INT_MAX / num_possible_cpus()) - return -ENOMEM; if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters)) return -ENOMEM;