osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

proto: Delay deleting heur_dtbl_entry_t in heur_dissector_delete 

Add the heur_dtbl_entry_t entry as deregistered when deleting a
heuristics dissector. The UDP dissector is storing a pointer to
this in proto_data and may access the entry during reload Lua
plugins until all packets are redissected.
This commit is contained in:
Stig Bjørlykke 2021-09-28 13:45:38 +02:00
parent 3cdada3e7b
commit e9ac4d3900
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/packet.c
View File

@ -2781,10 +2781,10 @@ heur_dissector_delete(const char *name, heur_dissector_t dissector, const int pr
if (found_entry) {
heur_dtbl_entry_t *found_hdtbl_entry = (heur_dtbl_entry_t *)(found_entry->data);
g_free(found_hdtbl_entry->list_name);
proto_add_deregistered_data(found_hdtbl_entry->list_name);
g_hash_table_remove(heuristic_short_names, found_hdtbl_entry->short_name);
g_free(found_hdtbl_entry->short_name);
g_slice_free(heur_dtbl_entry_t, found_entry->data);
proto_add_deregistered_data(found_hdtbl_entry->short_name);
proto_add_deregistered_slice(sizeof(heur_dtbl_entry_t), found_hdtbl_entry);
sub_dissectors->dissectors = g_slist_delete_link(sub_dissectors->dissectors,
found_entry);
}

37
epan/proto.c
View File

@ -362,9 +362,16 @@ struct _protocol {
/* List of all protocols */
static GList *protocols = NULL;
/* Structure stored for deregistered g_slice */
struct g_slice_data {
gsize block_size;
gpointer mem_block;
};
/* Deregistered fields */
static GPtrArray *deregistered_fields = NULL;
static GPtrArray *deregistered_data = NULL;
static GPtrArray *deregistered_slice = NULL;
/* indexed by prefix, contains initializers */
static GHashTable* prefixes = NULL;
@ -502,6 +509,7 @@ proto_init(GSList *register_all_plugin_protocols_list,
gpa_protocol_aliases = g_hash_table_new(g_str_hash, g_str_equal);
deregistered_fields = g_ptr_array_new();
deregistered_data = g_ptr_array_new();
deregistered_slice = g_ptr_array_new();
/* Initialize the ftype subsystem */
ftypes_initialize();
@ -630,6 +638,11 @@ proto_cleanup_base(void)
deregistered_data = NULL;
}
if (deregistered_slice) {
g_ptr_array_free(deregistered_slice, TRUE);
deregistered_slice = NULL;
}
g_free(tree_is_expanded);
tree_is_expanded = NULL;
@ -8008,6 +8021,17 @@ proto_add_deregistered_data (void *data)
g_ptr_array_add(deregistered_data, data);
}
void
proto_add_deregistered_slice (gsize block_size, gpointer mem_block)
{
struct g_slice_data *slice_data = g_slice_new(struct g_slice_data);
slice_data->block_size = block_size;
slice_data->mem_block = mem_block;
g_ptr_array_add(deregistered_slice, slice_data);
}
void proto_free_field_strings (ftenum_t field_type, unsigned int field_display, const void *field_strings)
{
if (field_strings == NULL) {
@ -8121,6 +8145,15 @@ free_deregistered_data (gpointer data, gpointer user_data _U_)
g_free (data);
}
static void
free_deregistered_slice (gpointer data, gpointer user_data _U_)
{
struct g_slice_data *slice_data = (struct g_slice_data *)data;
g_slice_free1(slice_data->block_size, slice_data->mem_block);
g_slice_free(struct g_slice_data, slice_data);
}
/* free deregistered fields and data */
void
proto_free_deregistered_fields (void)
@ -8134,6 +8167,10 @@ proto_free_deregistered_fields (void)
g_ptr_array_foreach(deregistered_data, free_deregistered_data, NULL);
g_ptr_array_free(deregistered_data, TRUE);
deregistered_data = g_ptr_array_new();
g_ptr_array_foreach(deregistered_slice, free_deregistered_slice, NULL);
g_ptr_array_free(deregistered_slice, TRUE);
deregistered_slice = g_ptr_array_new();
}
/* chars allowed in field abbrev: alphanumerics, '-', "_", and ".". */

6
epan/proto.h
View File

@ -2488,6 +2488,12 @@ proto_deregister_field (const int parent, gint hf_id);
WS_DLL_PUBLIC void
proto_add_deregistered_data (void *data);
/** Add a memory slice to be freed when deregistered fields are freed.
@param block_size the size of the block
@param mem_block a pointer to the block to free */
void
proto_add_deregistered_slice (gsize block_size, gpointer mem_block);
/** Free strings in a field.
@param field_type the field type (one of FT_ values)
@param field_display field display value (one of BASE_ values)