kernel: fix crash in act_connmark in 3.9 and 3.10 (fixes #13916, #13876)

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37493
11 years ago · a50c18c632
parent a1ec175d7b
commit a50c18c632
2 changed files with 46 additions and 24 deletions
--- a/target/linux/generic/patches-3.10/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.10/621-sched_act_connmark.patch
@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/net/sched/act_connmark.c
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,148 @@
 +/*
 + * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
 + *
@ -81,19 +81,30 @@
 +	return TC_ACT_PIPE;
 +}
 +
-+static int tcf_connmark_init(struct nlattr *nla, struct nlattr *est,
-+			 struct tc_action *a, int ovr, int bind)
+static int tcf_connmark_init(struct net *net, struct nlattr *nla,
+			     struct nlattr *est, struct tc_action *a,
+			     int ovr, int bind)
 +{
 +	struct tcf_common *pc;
-+
-+	pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
-+			     &connmark_idx_gen, &connmark_hash_info);
-+	if (IS_ERR(pc))
-+	    return PTR_ERR(pc);
-+
-+	tcf_hash_insert(pc, &connmark_hash_info);
-+
-+	return ACT_P_CREATED;
+	int ret = 0;
+
+	pc = tcf_hash_check(0, a, bind, &connmark_hash_info);
+	if (!pc) {
+		pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
+				     &connmark_idx_gen, &connmark_hash_info);
+		if (IS_ERR(pc))
+		    return PTR_ERR(pc);
+
+		tcf_hash_insert(pc, &connmark_hash_info);
+		ret = ACT_P_CREATED;
+	} else {
+		if (!ovr) {
+			tcf_hash_release(pc, bind, &connmark_hash_info);
+			return -EEXIST;
+		}
+	}
+
+	return ret;
 +}
 +
 +static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
--- a/target/linux/generic/patches-3.9/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.9/621-sched_act_connmark.patch
@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/net/sched/act_connmark.c
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,148 @@
 +/*
 + * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
 + *
@ -81,19 +81,30 @@
 +	return TC_ACT_PIPE;
 +}
 +
-+static int tcf_connmark_init(struct nlattr *nla, struct nlattr *est,
-+			 struct tc_action *a, int ovr, int bind)
+static int tcf_connmark_init(struct net *net, struct nlattr *nla,
+			     struct nlattr *est, struct tc_action *a,
+			     int ovr, int bind)
 +{
 +	struct tcf_common *pc;
-+
-+	pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
-+			     &connmark_idx_gen, &connmark_hash_info);
-+	if (IS_ERR(pc))
-+	    return PTR_ERR(pc);
-+
-+	tcf_hash_insert(pc, &connmark_hash_info);
-+
-+	return ACT_P_CREATED;
+	int ret = 0;
+
+	pc = tcf_hash_check(0, a, bind, &connmark_hash_info);
+	if (!pc) {
+		pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
+				     &connmark_idx_gen, &connmark_hash_info);
+		if (IS_ERR(pc))
+		    return PTR_ERR(pc);
+
+		tcf_hash_insert(pc, &connmark_hash_info);
+		ret = ACT_P_CREATED;
+	} else {
+		if (!ovr) {
+			tcf_hash_release(pc, bind, &connmark_hash_info);
+			return -EEXIST;
+		}
+	}
+
+	return ret;
 +}
 +
 +static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)