X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Fip_options.c;h=2f14745a9e1fb0aa5bdc779421d9376049963884;hb=c11eef21aa119a41fa210b9693f2346997885bcf;hp=251346828cb4ceca55d2f3b5622698b4fbd26249;hpb=a205752d1ad2d37d6597aaae5a56fc396a770868;p=linux-2.6

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 251346828c..2f14745a9e 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -513,11 +513,8 @@ void ip_options_undo(struct ip_options * opt)
 
 static struct ip_options *ip_options_get_alloc(const int optlen)
 {
-	struct ip_options *opt = kmalloc(sizeof(*opt) + ((optlen + 3) & ~3),
-					 GFP_KERNEL);
-	if (opt)
-		memset(opt, 0, sizeof(*opt));
-	return opt;
+	return kzalloc(sizeof(struct ip_options) + ((optlen + 3) & ~3),
+		       GFP_KERNEL);
 }
 
 static int ip_options_get_finish(struct ip_options **optp,