X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2Finet_diag.c;fp=net%2Fipv4%2Finet_diag.c;h=03cfe8fb42903c0e571c8e331076e6732281b5bb;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=06df7806bf1944073853913e6cec8e16f54ddee3;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 06df7806b..03cfe8fb4 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -11,6 +11,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -915,10 +916,11 @@ static int __init inet_diag_init(void)
 					  sizeof(struct inet_diag_handler *));
 	int err = -ENOMEM;
 
-	inet_diag_table = kzalloc(inet_diag_table_size, GFP_KERNEL);
+	inet_diag_table = kmalloc(inet_diag_table_size, GFP_KERNEL);
 	if (!inet_diag_table)
 		goto out;
 
+	memset(inet_diag_table, 0, inet_diag_table_size);
 	idiagnl = netlink_kernel_create(NETLINK_INET_DIAG, 0, inet_diag_rcv,
 					THIS_MODULE);
 	if (idiagnl == NULL)