tree 4741237af1e0106a8b164f89c02f158247f1ebc1
parent a86888b925299330053d20e0eba03ac4d2648c4b
author Pablo Neira <[EMAIL PROTECTED]> Wed, 10 Aug 2005 10:02:36 -0700
committer David S. Miller <[EMAIL PROTECTED]> Tue, 30 Aug 2005 05:39:00 -0700

[NETFILTER]: remove bogus memset() calls from ip_conntrack_netlink.c

nfattr_parse_nested() calls nfattr_parse() which in turn does a memset
on the 'tb' array.  All callers therefore don't need to memset before
calling it.

Signed-off-by: Pablo Neira <[EMAIL PROTECTED]>
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

 net/ipv4/netfilter/ip_conntrack_netlink.c |    8 --------
 1 files changed, 8 deletions(-)

diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c 
b/net/ipv4/netfilter/ip_conntrack_netlink.c
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -479,7 +479,6 @@ ctnetlink_parse_tuple_ip(struct nfattr *
 
        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 @@ ctnetlink_parse_tuple_proto(struct nfatt
 
        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 @@ ctnetlink_parse_tuple(struct nfattr *cda
 
        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 @@ static int ctnetlink_parse_nat_proto(str
 
        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 @@ ctnetlink_parse_nat(struct nfattr *cda[]
 
        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 @@ ctnetlink_parse_help(struct nfattr *attr
        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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to