[PATCH 2/7] Kill bogus memsets

[PATCH 2/7] Kill bogus memsets

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 105 bytes --]

nfattr_parse_attributes already set to zero the array of nfattr, so such 
initialization isn't required.

[-- Attachment #2: 01kill-memset.patch --]
[-- Type: text/x-patch, Size: 1558 bytes --]

Index: netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
--- netfilter-2.6.14.orig/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-08-01 16:20:26.000000000 +0200
+++ netfilter-2.6.14/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-08-01 16:25:00.000000000 +0200
@@ -479,7 +479,6 @@
 
 	DEBUGP("entered %s\n", __FUNCTION__);
 
-	memset(tb, 0, CTA_IP_MAX * sizeof(tb));
 	
 	if (nfattr_parse_nested(tb, CTA_IP_MAX, attr) < 0)
 		goto nfattr_failure;
@@ -522,8 +521,6 @@
 
 	DEBUGP("entered %s\n", __FUNCTION__);
 
-	memset(tb, 0, CTA_PROTO_MAX * sizeof(tb));
-	
 	if (nfattr_parse_nested(tb, CTA_PROTO_MAX, attr) < 0)
 		goto nfattr_failure;
 
@@ -556,7 +553,6 @@
 
 	DEBUGP("entered %s\n", __FUNCTION__);
 
-	memset(tb, 0, CTA_TUPLE_MAX * sizeof(tb));
 	memset(tuple, 0, sizeof(*tuple));
 
 	if (nfattr_parse_nested(tb, CTA_TUPLE_MAX, cda[type-1]) < 0)
@@ -607,8 +603,6 @@
 
 	DEBUGP("entered %s\n", __FUNCTION__);
 
-	memset(tb, 0, CTA_PROTONAT_MAX * sizeof(tb));
-
 	if (nfattr_parse_nested(tb, CTA_PROTONAT_MAX, attr) < 0)
 		goto nfattr_failure;
 
@@ -646,7 +640,6 @@
 
 	DEBUGP("entered %s\n", __FUNCTION__);
 
-	memset(tb, 0, CTA_NAT_MAX * sizeof(tb));
 	memset(range, 0, sizeof(*range));
 	
 	if (nfattr_parse_nested(tb, CTA_NAT_MAX, cda[CTA_NAT-1]) < 0)
@@ -684,7 +677,6 @@
 	struct nfattr *tb[CTA_HELP_MAX];
 
 	DEBUGP("entered %s\n", __FUNCTION__);
-	memset(tb, 0, CTA_HELP_MAX * sizeof(tb));
 
 	if (nfattr_parse_nested(tb, CTA_HELP_MAX, attr) < 0)
 		goto nfattr_failure;

Re: [PATCH 2/7] Kill bogus memsets

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

On Mon, Aug 01, 2005 at 07:04:57PM +0200, Pablo Neira wrote:
> nfattr_parse_attributes already set to zero the array of nfattr, so such 
> initialization isn't required.

I think you are referring to nfattr_parse[] ;)  And yes, you are
correct, we can kill those memset's.  I'll apply your patch (and push it
to davem).  Please include a "Signed-off-by:" Line with your future
patches, thanks!

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]