aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/sched/act_ipt.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 350e134cffb3..8b5270008a6e 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -96,7 +96,7 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
96 struct tcf_ipt *ipt; 96 struct tcf_ipt *ipt;
97 struct xt_entry_target *td, *t; 97 struct xt_entry_target *td, *t;
98 char *tname; 98 char *tname;
99 int ret = 0, err; 99 int ret = 0, err, exists = 0;
100 u32 hook = 0; 100 u32 hook = 0;
101 u32 index = 0; 101 u32 index = 0;
102 102
@@ -107,18 +107,23 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla,
107 if (err < 0) 107 if (err < 0)
108 return err; 108 return err;
109 109
110 if (tb[TCA_IPT_HOOK] == NULL) 110 if (tb[TCA_IPT_INDEX] != NULL)
111 return -EINVAL; 111 index = nla_get_u32(tb[TCA_IPT_INDEX]);
112 if (tb[TCA_IPT_TARG] == NULL) 112
113 exists = tcf_hash_check(tn, index, a, bind);
114 if (exists && bind)
115 return 0;
116
117 if (tb[TCA_IPT_HOOK] == NULL || tb[TCA_IPT_TARG] == NULL) {
118 if (exists)
119 tcf_hash_release(a, bind);
113 return -EINVAL; 120 return -EINVAL;
121 }
114 122
115 td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]); 123 td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]);
116 if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size) 124 if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size)
117 return -EINVAL; 125 return -EINVAL;
118 126
119 if (tb[TCA_IPT_INDEX] != NULL)
120 index = nla_get_u32(tb[TCA_IPT_INDEX]);
121
122 if (!tcf_hash_check(tn, index, a, bind)) { 127 if (!tcf_hash_check(tn, index, a, bind)) {
123 ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind, 128 ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind,
124 false); 129 false);