diff options
| author | Jeremy Allison <jra@samba.org> | 2010-02-24 18:11:07 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-02-24 18:11:07 -0800 |
| commit | d1950d66c4ed38918323bdb8c0bb11700a47bdc3 (patch) | |
| tree | 0101c666e0272d8665cc09bccbdfb461f436a2bc /source3/smbd/smb2_tcon.c | |
| parent | 3c202519eccfa1922f315e2f2910d832016ad3f1 (diff) | |
| download | samba-d1950d66c4ed38918323bdb8c0bb11700a47bdc3.tar.gz samba-d1950d66c4ed38918323bdb8c0bb11700a47bdc3.tar.bz2 samba-d1950d66c4ed38918323bdb8c0bb11700a47bdc3.zip | |
Make conn_close_all() safe to call from SMB2 sessions (fix crash bug).
Ensure we don't call close_cnum() with SMB2, also talloc_move the
compat_conn pointer from the NULL context onto the tcon context
in SMB2 as it's conceptually owned by that pointer.
Jeremy.
Diffstat (limited to 'source3/smbd/smb2_tcon.c')
| -rw-r--r-- | source3/smbd/smb2_tcon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index 70c5e8845e..bd33007c18 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -150,6 +150,7 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, fstring service; int snum = -1; struct smbd_smb2_tcon *tcon; + connection_struct *compat_conn = NULL; int id; NTSTATUS status; @@ -196,14 +197,15 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, tcon->session = req->session; talloc_set_destructor(tcon, smbd_smb2_tcon_destructor); - tcon->compat_conn = make_connection_snum(req->sconn, + compat_conn = make_connection_snum(req->sconn, snum, req->session->compat_vuser, data_blob_null, "???", &status); - if (tcon->compat_conn == NULL) { + if (compat_conn == NULL) { TALLOC_FREE(tcon); return status; } + tcon->compat_conn = talloc_move(tcon, &compat_conn); tcon->compat_conn->cnum = tcon->tid; *out_share_type = 0x01; |