summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-09-14 10:53:33 +0200
committerjenkins_ndg <jenkins_ndg@intel.com>2017-09-22 07:52:29 -0700
commit991621aab6a21b432885c84d8802651d96dd66ab (patch)
treec755da3fb2fd2c0917be760b5d09d98ffec03eb8
parent1371f41ba875858d5256ef1e557b5f376aa98b8d (diff)
downloadx86-android-x86-glacier-3.10-nougat-mr1-wear-release.tar.gz
sctp: do not inherit ipv6_{mc|ac|fl}_list from parentandroid-wear-7.1.1_r0.45android-x86-glacier-3.10-nougat-mr1-wear-release
SCTP needs fixes similar to 83eaddab4378 ("ipv6/dccp: do not inherit ipv6_mc_list from parent"), otherwise bad things can happen. Change-Id: Ia0887948642ee3dc24453a405481a32db0c75285 Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Andrey Konovalov <andreyknvl@google.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Tracked-On: https://jira01.devtools.intel.com/browse/AW-7175 Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Loic Akue <loicx.akue@intel.com> Reviewed-on: https://android.intel.com/600485 Reviewed-by: Dubray, SimonX <simonx.dubray@intel.com> Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
-rw-r--r--net/sctp/ipv6.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index bee032a7003f..550ca1b5c0da 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -658,6 +658,9 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
newnp = inet6_sk(newsk);
memcpy(newnp, np, sizeof(struct ipv6_pinfo));
+ newnp->ipv6_mc_list = NULL;
+ newnp->ipv6_ac_list = NULL;
+ newnp->ipv6_fl_list = NULL;
rcu_read_lock();
opt = rcu_dereference(np->opt);