Re: [PATCH 4.4 14/20] sctp: avoid BUG_ON on sctp_wait_for_sndbuf

[Ben Hutchings]

On Thu, 2017-02-16 at 09:53 -0800, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.ÂÂIf anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Marcelo Ricardo Leitner <marcelo.leitner@xxxxxxxxx>
> 
> 
> [ Upstream commit 2dcab598484185dea7ec22219c76dcdd59e3cb90 ]
[...]
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -6960,7 +6960,8 @@ static int sctp_wait_for_sndbuf(struct s
> Â		Â*/
> Â		release_sock(sk);
> Â		current_timeo = schedule_timeout(current_timeo);
> -		BUG_ON(sk != asoc->base.sk);
> +		if (sk != asoc->base.sk)
> +			goto do_error;

This function normally returns with sk still locked, but in this case
it returns with sk unlocked.  Perhaps this check should be moved after
the lock_sock(sk)?

Ben.

> Â		lock_sock(sk);
> Â
> Â		*timeo_p = current_timeo;
> 
> 
-- 
Ben Hutchings
73.46% of all statistics are made up.

Attachment: signature.asc
Description: This is a digitally signed message part