lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Sat, 5 Dec 2015 08:31:11 -0200
From:	Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
To:	Xin Long <lucien.xin@...il.com>,
	network dev <netdev@...r.kernel.org>,
	linux-sctp@...r.kernel.org
Cc:	vyasevic@...hat.com, davem@...emloft.net
Subject: Re: [PATCH net] sctp: only drop the reference on the datamsg after
 sending a msg

Em 05-12-2015 05:19, Xin Long escreveu:
> If the chunks are enqueued successfully but sctp_cmd_interpreter()
> return err to sctp_sendmsg() (mainly because of no mem), the chunks will
> get re-queued, but we are dropping the reference and freeing them.
>
> The fix is to just drop the reference on the datamsg just as it had
> succeeded, as:
>   - if the chunks weren't queued, this is enough to get them freed.
>   - if they were queued, they will get freed when they finally get out or
>   discarded.
>
> Signed-off-by: Xin Long <lucien.xin@...il.com>
> Marcelo Ricardo Leitner <marcelo.leitner@...il.com>

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@...il.com>

Thanks Xin

> ---
>   net/sctp/socket.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 03c8256..d8460be 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -1966,15 +1966,13 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
>   	 * breaks.
>   	 */
>   	err = sctp_primitive_SEND(net, asoc, datamsg);
> +	sctp_datamsg_put(datamsg);
>   	/* Did the lower layer accept the chunk? */
> -	if (err) {
> -		sctp_datamsg_free(datamsg);
> +	if (err)
>   		goto out_free;
> -	}
>
>   	pr_debug("%s: we sent primitively\n", __func__);
>
> -	sctp_datamsg_put(datamsg);
>   	err = msg_len;
>
>   	if (unlikely(wait_connect)) {
>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists