From: Dan Robertson <drobertson@tripwire.com> Date: Thu, 22 Feb 2018 20:47:11 +0000 Subject: [PATCH] libsmb: Use smb2 tcon if conn_protocol >= SMB2_02 When the connection protocol is SMB2 the tid from the smb1 member is used instead of smb2 in cli_state_set_tid which often results in a null deref. Signed-off-by: Dan Robertson <drobertson@tripwire.com> --- source3/libsmb/clientgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 44afee1d4a0..2e4dd15ab62 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -371,7 +371,7 @@ uint32_t cli_state_set_tid(struct cli_state *cli, uint32_t tid) uint32_t ret; if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { ret = smb2cli_tcon_current_id(cli->smb2.tcon); - smb2cli_tcon_set_id(cli->smb1.tcon, tid); + smb2cli_tcon_set_id(cli->smb2.tcon, tid); } else { ret = smb1cli_tcon_current_id(cli->smb1.tcon); smb1cli_tcon_set_id(cli->smb1.tcon, tid);
Created attachment 14017 [details] git-am fox for 4.8.0rcNext, 4.7.next, 4.6.next. Cherry-pick from master.
Karolin, please add the patch to the relevant versions. Thanks!
Pushed to autobuild-v4-8-test.
(In reply to Stefan Metzmacher from comment #3) Pushed to v4-8-test, further backporting need to follow
Pushed to autobuild-v4-{6,7}-test.
(In reply to Stefan Metzmacher from comment #5) Pushed to v4-{6,7}-test.