mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-18 07:47:47 -04:00
smb: server: avoid double-free in smb_direct_free_sendmsg after smb_direct_flush_send_list()
smb_direct_flush_send_list() already calls smb_direct_free_sendmsg(),
so we should not call it again after post_sendmsg()
moved it to the batch list.
Reported-by: Ruikai Peng <ruikai@pwno.io>
Closes: https://lore.kernel.org/linux-cifs/CAFD3drNOSJ05y3A+jNXSDxW-2w09KHQ0DivhxQ_pcc7immVVOQ@mail.gmail.com/
Fixes: 34abd408c8 ("smb: server: make use of smbdirect_socket.send_io.bcredits")
Cc: stable@kernel.org
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Ruikai Peng <ruikai@pwno.io>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Cc: security@kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Acked-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
Tested-by: Ruikai Peng <ruikai@pwno.io>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
committed by
Steve French
parent
27b7c3e916
commit
84ff995ae8
@@ -1588,15 +1588,21 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
/*
|
||||
* From here msg is moved to send_ctx
|
||||
* and we should not free it explicitly.
|
||||
*/
|
||||
|
||||
if (send_ctx == &_send_ctx) {
|
||||
ret = smb_direct_flush_send_list(sc, send_ctx, true);
|
||||
if (ret)
|
||||
goto err;
|
||||
goto flush_failed;
|
||||
}
|
||||
|
||||
return 0;
|
||||
err:
|
||||
smb_direct_free_sendmsg(sc, msg);
|
||||
flush_failed:
|
||||
header_failed:
|
||||
atomic_inc(&sc->send_io.credits.count);
|
||||
credit_failed:
|
||||
|
||||
Reference in New Issue
Block a user