From 2b6b9777b62bc7b01622a5a9a01259c59a27ff16 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Mon, 14 Feb 2011 16:49:23 +0100 Subject: [PATCH] --- yaml --- r: 237528 b: refs/heads/master c: d846f71195d57b0bbb143382647c2c6638b04c5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/netfilter/ebtables.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fbcd27b893cc..55d8fa2ba8b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44bd4de9c2270b22c3c898310102bc6be9ed2978 +refs/heads/master: d846f71195d57b0bbb143382647c2c6638b04c5a diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c index 5f1825df9dca..893669caa8de 100644 --- a/trunk/net/bridge/netfilter/ebtables.c +++ b/trunk/net/bridge/netfilter/ebtables.c @@ -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)