Message ID | 20170321195304.7840-1-cascardo@canonical.com |
---|---|
State | New |
Headers | show |
ACK to both patches, though patch 2 essentially negates patch 1.
Applied to trusty master-next branch. Thanks. Cascardo.
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2aac2d8..da2ff8f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6722,7 +6722,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, */ sctp_release_sock(sk); current_timeo = schedule_timeout(current_timeo); - BUG_ON(sk != asoc->base.sk); + if (sk != asoc->base.sk) + goto do_error; sctp_lock_sock(sk); *timeo_p = current_timeo;