diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-02 14:30:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-02 14:30:24 -0500 |
| commit | 3872b284087081ee5cb0e4630954c2f7a2153cf5 (patch) | |
| tree | ead36598e35730e419edcf42dc788290af9e3d5b /net/bridge | |
| parent | 07df5294a753dfac2cc9f75e6159fc25fdc22149 (diff) | |
| parent | 8a80c79a776d1b1b54895314ffaf53d0c7604c80 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 5f1825df9dca..893669caa8de 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
| @@ -1107,6 +1107,8 @@ static int do_replace(struct net *net, const void __user *user, | |||
| 1107 | if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter)) | 1107 | if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter)) |
| 1108 | return -ENOMEM; | 1108 | return -ENOMEM; |
| 1109 | 1109 | ||
| 1110 | tmp.name[sizeof(tmp.name) - 1] = 0; | ||
| 1111 | |||
| 1110 | countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids; | 1112 | countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids; |
| 1111 | newinfo = vmalloc(sizeof(*newinfo) + countersize); | 1113 | newinfo = vmalloc(sizeof(*newinfo) + countersize); |
| 1112 | if (!newinfo) | 1114 | if (!newinfo) |