diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2011-04-12 17:20:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-13 04:33:50 +0200 |
| commit | 25f7bf7d0dfb460505cbe42676340e33100aca2e (patch) | |
| tree | 76467af7ca483f836f9acc2fc73f000db6223a4e /net/sctp/associola.c | |
| parent | net: Disable NETIF_F_TSO_ECN when TSO is disabled (diff) | |
| download | linux-25f7bf7d0dfb460505cbe42676340e33100aca2e.tar.xz linux-25f7bf7d0dfb460505cbe42676340e33100aca2e.zip | |
sctp: fix oops when updating retransmit path with DEBUG on
commit fbdf501c9374966a56829ecca3a7f25d2b49a305
sctp: Do no select unconfirmed transports for retransmissions
Introduced the initial falt.
commit d598b166ced20d9b9281ea3527c0e18405ddb803
sctp: Make sure we always return valid retransmit path
Solved the problem, but forgot to change the DEBUG statement.
Thus it was still possible to dereference a NULL pointer.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
| -rw-r--r-- | net/sctp/associola.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 0698cad61763..922fdd7eb573 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -1323,6 +1323,8 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc) if (t) asoc->peer.retran_path = t; + else + t = asoc->peer.retran_path; SCTP_DEBUG_PRINTK_IPADDR("sctp_assoc_update_retran_path:association" " %p addr: ", |