]> Pileus Git - ~andy/linux/commitdiff
sctp: fix oops when updating retransmit path with DEBUG on
authorVlad Yasevich <vladislav.yasevich@hp.com>
Tue, 12 Apr 2011 15:20:48 +0000 (15:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Apr 2011 02:33:50 +0000 (19:33 -0700)
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>
net/sctp/associola.c

index 0698cad6176367c5a0ad6dffefcf07133304e9fb..922fdd7eb57335e41f7112711210273c6522ec5a 100644 (file)
@@ -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: ",