Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 237528
b: refs/heads/master
c: d846f71
h: refs/heads/master
v: v3
  • Loading branch information
Vasiliy Kulikov authored and Patrick McHardy committed Feb 14, 2011
1 parent 3a18502 commit 2b6b977
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44bd4de9c2270b22c3c898310102bc6be9ed2978
refs/heads/master: d846f71195d57b0bbb143382647c2c6638b04c5a
2 changes: 2 additions & 0 deletions trunk/net/bridge/netfilter/ebtables.c
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,8 @@ static int do_replace(struct net *net, const void __user *user,
if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
return -ENOMEM;

tmp.name[sizeof(tmp.name) - 1] = 0;

countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
newinfo = vmalloc(sizeof(*newinfo) + countersize);
if (!newinfo)
Expand Down

0 comments on commit 2b6b977

Please sign in to comment.