X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fsched%2Fematch.c;h=5cb956b721e8e05a452262decdc114061cb0a0a0;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=0fd0768a17c6cc9ab5b627bbfd94bee9c03b9657;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 0fd0768a1..5cb956b72 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -81,6 +81,7 @@
  *      open up a beer to watch the compilation going.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -321,9 +322,10 @@ int tcf_em_tree_validate(struct tcf_proto *tp, struct rtattr *rta,
 	list_len = RTA_PAYLOAD(rt_list);
 	matches_len = tree_hdr->nmatches * sizeof(*em);
 
-	tree->matches = kzalloc(matches_len, GFP_KERNEL);
+	tree->matches = kmalloc(matches_len, GFP_KERNEL);
 	if (tree->matches == NULL)
 		goto errout;
+	memset(tree->matches, 0, matches_len);
 
 	/* We do not use rtattr_parse_nested here because the maximum
 	 * number of attributes is unknown. This saves us the allocation