: Remove checks for impossible conditions in ipt action
Subsystems (2)
PATCH 11/17 : Remove checks for impossible conditions in ipt action
Remove checks for impossible conditions in ipt action, same as for gact.
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/12/30 02:52:02+01:00 [email protected]
# [PKT_SCHED]: Remove checks for impossible conditions in ipt action
#
# Signed-off-by: Patrick McHardy <[email protected]>
#
# net/sched/ipt.c # 2004/12/30 02:51:56+01:00 [email protected] +1 -9 # [PKT_SCHED]: Remove checks for impossible conditions in ipt action # # Signed-off-by: Patrick McHardy <[email protected]> # diff -Nru a/net/sched/ipt.c b/net/sched/ipt.c --- a/net/sched/ipt.c 2004-12-30 04:01:42 +01:00 +++ b/net/sched/ipt.c 2004-12-30 04:01:42 +01:00 @@ -104,8 +104,7 @@ u32 index = 0; u32 hook = 0;
- if (a == NULL || rta == NULL ||
- rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0)
+ if (rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0)
return -1;
if (tb[TCA_IPT_INDEX - 1]) {
@@ -243,9 +242,6 @@
struct tcf_ipt *p = PRIV(a, ipt);
struct sk_buff *skb = *pskb;
- if (p == NULL || skb == NULL)
- return -1;
-
spin_lock(&p->lock);
p->tm.lastuse = jiffies;
@@ -293,10 +289,6 @@
unsigned char *b = skb->tail;
struct tcf_ipt *p = PRIV(a, ipt);
- if (p == NULL) {
- printk("BUG: tcf_ipt_dump called with NULL params\n");
- goto rtattr_failure;
- }
/* for simple targets kernel size == user size ** user name = target name
** for foolproof you need to not assume this
* Patrick McHardy <[email protected]> 2004-12-30 04:40
Review
Quoted 4 lines
(quoted diff) +1
-2- if (a == NULL || rta == NULL || - rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0) + if (rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0) return -1;
You might want to use rtattr_parse_nested here (see patch 1 of my latest patchset)
if (rtattr_parse_nested(tb, TCA_IPT_MAX, rta) < 0)
Purely cosmetic though. It gives a slightly better hint on what is being done.
Quoted 11 lines · Thomas Graf
* Patrick McHardy <[email protected]> 2004-12-30 04:40
Quoted 4 lines
(quoted diff) +1
-2- if (a == NULL || rta == NULL || - rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0) + if (rtattr_parse(tb, TCA_IPT_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)) < 0)return -1;You might want to use
rtattr_parse_nestedhere (see patch 1 of my latest patchset)
Quoted 4 lines
if (
rtattr_parse_nested(tb, TCA_IPT_MAX, rta)< 0)Purely cosmetic though. It gives a slightly better hint on what is being done.
We can do this once your changes are merged (I'll review them later today). For now I prefer to leave it this way so I can work on a vanilla tree.
Regards
Patrick