osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

SMB2: fix two memory leaks 

* Since c3342930 we don't free anymore the entries in the files hashtables.
The cleanest solution is probably to convert these hashtables into two
wmem_map_t structures and let the wmem core handling any cleanup.

* b0f5b2c174 added supported for chained compression; the uncompressed
tvb must be freed


(cherry picked from commit e677a909e1)
This commit is contained in:
Nardi Ivan 2021-03-16 17:06:20 +00:00 committed by Ivan Nardi
parent 6b072b63f0
commit 3bca4e3b3f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-smb2.c
View File

@ -1488,8 +1488,8 @@ smb2_get_session(smb2_conv_info_t *conv _U_, guint64 id, packet_info *pinfo, smb
ses->sesid = id;
ses->auth_frame = (guint32)-1;
ses->tids = wmem_map_new(wmem_file_scope(), smb2_tid_info_hash, smb2_tid_info_equal);
ses->fids = g_hash_table_new(smb2_fid_info_hash, smb2_fid_info_equal);
ses->files = g_hash_table_new(smb2_eo_files_hash, smb2_eo_files_equal);
ses->fids = wmem_map_new(wmem_file_scope(), smb2_fid_info_hash, smb2_fid_info_equal);
ses->files = wmem_map_new(wmem_file_scope(), smb2_eo_files_hash, smb2_eo_files_equal);
seskey_find_sid_key(id, ses->session_key, ses->client_decryption_key, ses->server_decryption_key);
if (pinfo && si) {
@ -2364,7 +2364,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
dcerpc_store_polhnd_name(&policy_hnd, pinfo,
fid_name);
g_hash_table_insert(si->session->fids, sfi, sfi);
wmem_map_insert(si->session->fids, sfi, sfi);
si->file = sfi;
/* If needed, create the file entry and save the policy hnd */
@ -2374,13 +2374,13 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
}
if (si->conv) {
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->session->files,&policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)wmem_map_lookup(si->session->files,&policy_hnd);
if (!eo_file_info) {
eo_file_info = wmem_new(wmem_file_scope(), smb2_eo_file_info_t);
policy_hnd_hashtablekey = wmem_new(wmem_file_scope(), e_ctx_hnd);
memcpy(policy_hnd_hashtablekey, &policy_hnd, sizeof(e_ctx_hnd));
eo_file_info->end_of_file=0;
g_hash_table_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
wmem_map_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
}
si->eo_file_info=eo_file_info;
}
@ -2388,7 +2388,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
break;
case FID_MODE_CLOSE:
if (!pinfo->fd->visited) {
smb2_fid_info_t *fid = (smb2_fid_info_t *)g_hash_table_lookup(si->session->fids, &sfi_key);
smb2_fid_info_t *fid = (smb2_fid_info_t *)wmem_map_lookup(si->session->fids, &sfi_key);
if (fid) {
/* set last frame */
fid->frame_end = pinfo->num;
@ -2403,7 +2403,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
break;
}
si->file = (smb2_fid_info_t *)g_hash_table_lookup(si->session->fids, &sfi_key);
si->file = (smb2_fid_info_t *)wmem_map_lookup(si->session->fids, &sfi_key);
if (si->file) {
if (si->saved) {
si->saved->file = si->file;
@ -2421,7 +2421,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
if (!si->eo_file_info) {
if (si->saved) { si->saved->policy_hnd = policy_hnd; }
if (si->conv) {
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->session->files,&policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)wmem_map_lookup(si->session->files,&policy_hnd);
if (eo_file_info) {
si->eo_file_info=eo_file_info;
} else { /* XXX This should never happen */
@ -2429,7 +2429,7 @@ dissect_smb2_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
policy_hnd_hashtablekey = wmem_new(wmem_file_scope(), e_ctx_hnd);
memcpy(policy_hnd_hashtablekey, &policy_hnd, sizeof(e_ctx_hnd));
eo_file_info->end_of_file=0;
g_hash_table_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
wmem_map_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
}
}
@ -10333,6 +10333,8 @@ dissect_smb2_chained_comp_payload(packet_info *pinfo, proto_tree *tree,
}
out:
if (uncomp_tvb)
tvb_free(uncomp_tvb);
proto_tree_add_item(subtree, hf_smb2_comp_transform_data, tvb, offset, length, ENC_NA);
offset += length;
@ -10985,14 +10987,14 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea
/* If needed, create the file entry and save the policy hnd */
if (!si->eo_file_info) {
if (si->conv) {
eo_file_info = (smb2_eo_file_info_t *)g_hash_table_lookup(si->session->files,&ssi->policy_hnd);
eo_file_info = (smb2_eo_file_info_t *)wmem_map_lookup(si->session->files,&ssi->policy_hnd);
if (!eo_file_info) { /* XXX This should never happen */
/* assert(1==0); */
eo_file_info = wmem_new(wmem_file_scope(), smb2_eo_file_info_t);
policy_hnd_hashtablekey = wmem_new(wmem_file_scope(), e_ctx_hnd);
memcpy(policy_hnd_hashtablekey, &ssi->policy_hnd, sizeof(e_ctx_hnd));
eo_file_info->end_of_file=0;
g_hash_table_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
wmem_map_insert(si->session->files,policy_hnd_hashtablekey,eo_file_info);
}
si->eo_file_info=eo_file_info;
}

4
epan/dissectors/packet-smb2.h
View File

@ -97,9 +97,9 @@ typedef struct _smb2_sesid_info_t {
guint8 server_decryption_key[AES_KEY_SIZE];
wmem_map_t *tids;
GHashTable *fids;
wmem_map_t *fids;
/* table to store some infos for smb export object */
GHashTable *files;
wmem_map_t *files;
guint8 preauth_hash[SMB2_PREAUTH_HASH_SIZE];
} smb2_sesid_info_t;