AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sctp: update dst pmtu with the correct daddr

Browse Source 
When processing pmtu update from an icmp packet, it calls .update_pmtu
with sk instead of skb in sctp_transport_update_pmtu.

However for sctp, the daddr in the transport might be different from
inet_sock->inet_daddr or sk->sk_v6_daddr, which is used to update or
create the route cache. The incorrect daddr will cause a different
route cache created for the path.

So before calling .update_pmtu, inet_sock->inet_daddr/sk->sk_v6_daddr
should be updated with the daddr in the transport, and update it back
after it's done.

The issue has existed since route exceptions introduction.

Fixes: 4895c771c7 ("ipv4: Add FIB nexthop exceptions.")
Reported-by: ian.periam@dialogic.com
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2018-09-20 17:27:28 +08:00 committed by David S. Miller
parent 8c6ec3613e
commit d7ab5cdce5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/sctp/transport.c
View File

@ -260,6 +260,7 @@ void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
bool sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu) bool sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
{ {
struct dst_entry *dst = sctp_transport_dst_check(t); struct dst_entry *dst = sctp_transport_dst_check(t);
struct sock *sk = t->asoc->base.sk;
bool change = true; bool change = true;
if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) { if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) {
@ -271,12 +272,19 @@ bool sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
pmtu = SCTP_TRUNC4(pmtu); pmtu = SCTP_TRUNC4(pmtu);
if (dst) { if (dst) {
dst->ops->update_pmtu(dst, t->asoc->base.sk, NULL, pmtu); struct sctp_pf *pf = sctp_get_pf_specific(dst->ops->family);
union sctp_addr addr;
pf->af->from_sk(&addr, sk);
pf->to_sk_daddr(&t->ipaddr, sk);
dst->ops->update_pmtu(dst, sk, NULL, pmtu);
pf->to_sk_daddr(&addr, sk);
dst = sctp_transport_dst_check(t); dst = sctp_transport_dst_check(t);
} }
if (!dst) { if (!dst) {
t->af_specific->get_dst(t, &t->saddr, &t->fl, t->asoc->base.sk); t->af_specific->get_dst(t, &t->saddr, &t->fl, sk);
dst = t->dst; dst = t->dst;
} }