Skip to content

Commit

Permalink
[NETFILTER] nfnetlink: nfattr_parse() can never fail, make it void
Browse files Browse the repository at this point in the history 
nfattr_parse (and thus nfattr_parse_nested) always returns success. So we
can make them 'void' and remove all the checking at the caller side.

Based on original patch by Pablo Neira Ayuso <pablo@netfilter.org>

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Harald Welte authored and David S. Miller committed Nov 9, 2005
1 parent eaae4fa commit a2506c0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 46 deletions.
2 changes: 1 addition & 1 deletion include/linux/netfilter/nfnetlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ extern void nfnl_unlock(void);
extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);

extern int nfattr_parse(struct nfattr *tb[], int maxattr,
extern void nfattr_parse(struct nfattr *tb[], int maxattr,
struct nfattr *nfa, int len);

#define nfattr_parse_nested(tb, max, nfa) \
Expand Down
45 changes: 8 additions & 37 deletions net/ipv4/netfilter/ip_conntrack_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)

DEBUGP("entered %s\n", __FUNCTION__);


if (nfattr_parse_nested(tb, CTA_IP_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_IP_MAX, attr);

if (nfattr_bad_size(tb, CTA_IP_MAX, cta_min_ip))
return -EINVAL;
Expand All @@ -500,9 +498,6 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)
DEBUGP("leaving\n");

return 0;

nfattr_failure:
return -1;
}

static const int cta_min_proto[CTA_PROTO_MAX] = {
Expand All @@ -524,8 +519,7 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr,

DEBUGP("entered %s\n", __FUNCTION__);

if (nfattr_parse_nested(tb, CTA_PROTO_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_PROTO_MAX, attr);

if (nfattr_bad_size(tb, CTA_PROTO_MAX, cta_min_proto))
return -EINVAL;
Expand All @@ -542,9 +536,6 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr,
}

return ret;

nfattr_failure:
return -1;
}

static inline int
Expand All @@ -558,8 +549,7 @@ ctnetlink_parse_tuple(struct nfattr *cda[], struct ip_conntrack_tuple *tuple,

memset(tuple, 0, sizeof(*tuple));

if (nfattr_parse_nested(tb, CTA_TUPLE_MAX, cda[type-1]) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_TUPLE_MAX, cda[type-1]);

if (!tb[CTA_TUPLE_IP-1])
return -EINVAL;
Expand All @@ -586,9 +576,6 @@ ctnetlink_parse_tuple(struct nfattr *cda[], struct ip_conntrack_tuple *tuple,
DEBUGP("leaving\n");

return 0;

nfattr_failure:
return -1;
}

#ifdef CONFIG_IP_NF_NAT_NEEDED
Expand All @@ -606,11 +593,10 @@ static int ctnetlink_parse_nat_proto(struct nfattr *attr,

DEBUGP("entered %s\n", __FUNCTION__);

if (nfattr_parse_nested(tb, CTA_PROTONAT_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_PROTONAT_MAX, attr);

if (nfattr_bad_size(tb, CTA_PROTONAT_MAX, cta_min_protonat))
goto nfattr_failure;
return -1;

npt = ip_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum);
if (!npt)
Expand All @@ -629,9 +615,6 @@ static int ctnetlink_parse_nat_proto(struct nfattr *attr,

DEBUGP("leaving\n");
return 0;

nfattr_failure:
return -1;
}

static inline int
Expand All @@ -645,8 +628,7 @@ ctnetlink_parse_nat(struct nfattr *cda[],

memset(range, 0, sizeof(*range));

if (nfattr_parse_nested(tb, CTA_NAT_MAX, cda[CTA_NAT-1]) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_NAT_MAX, cda[CTA_NAT-1]);

if (tb[CTA_NAT_MINIP-1])
range->min_ip = *(u_int32_t *)NFA_DATA(tb[CTA_NAT_MINIP-1]);
Expand All @@ -668,9 +650,6 @@ ctnetlink_parse_nat(struct nfattr *cda[],

DEBUGP("leaving\n");
return 0;

nfattr_failure:
return -1;
}
#endif

Expand All @@ -681,18 +660,14 @@ ctnetlink_parse_help(struct nfattr *attr, char **helper_name)

DEBUGP("entered %s\n", __FUNCTION__);

if (nfattr_parse_nested(tb, CTA_HELP_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_HELP_MAX, attr);

if (!tb[CTA_HELP_NAME-1])
return -EINVAL;

*helper_name = NFA_DATA(tb[CTA_HELP_NAME-1]);

return 0;

nfattr_failure:
return -1;
}

static int
Expand Down Expand Up @@ -960,8 +935,7 @@ ctnetlink_change_protoinfo(struct ip_conntrack *ct, struct nfattr *cda[])
u_int16_t npt = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;
int err = 0;

if (nfattr_parse_nested(tb, CTA_PROTOINFO_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_PROTOINFO_MAX, attr);

proto = ip_conntrack_proto_find_get(npt);
if (!proto)
Expand All @@ -972,9 +946,6 @@ ctnetlink_change_protoinfo(struct ip_conntrack *ct, struct nfattr *cda[])
ip_conntrack_proto_put(proto);

return err;

nfattr_failure:
return -ENOMEM;
}

static int
Expand Down
6 changes: 1 addition & 5 deletions net/ipv4/netfilter/ip_conntrack_proto_tcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,7 @@ static int nfattr_to_tcp(struct nfattr *cda[], struct ip_conntrack *ct)
struct nfattr *attr = cda[CTA_PROTOINFO_TCP-1];
struct nfattr *tb[CTA_PROTOINFO_TCP_MAX];

if (nfattr_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr) < 0)
goto nfattr_failure;
nfattr_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr);

if (!tb[CTA_PROTOINFO_TCP_STATE-1])
return -EINVAL;
Expand All @@ -374,9 +373,6 @@ static int nfattr_to_tcp(struct nfattr *cda[], struct ip_conntrack *ct)
write_unlock_bh(&tcp_lock);

return 0;

nfattr_failure:
return -1;
}
#endif

Expand Down
4 changes: 1 addition & 3 deletions net/netfilter/nfnetlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void __nfa_fill(struct sk_buff *skb, int attrtype, int attrlen,
memset(NFA_DATA(nfa) + attrlen, 0, NFA_ALIGN(size) - size);
}

int nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len)
void nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len)
{
memset(tb, 0, sizeof(struct nfattr *) * maxattr);

Expand All @@ -138,8 +138,6 @@ int nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len)
tb[flavor-1] = nfa;
nfa = NFA_NEXT(nfa, len);
}

return 0;
}

/**
Expand Down

0 comments on commit a2506c0

Please sign in to comment.