Commit 85b9cb2e authored by Ben Pfaff's avatar Ben Pfaff

ofproto-dpif-rid: Fix memory leak in recirc_state.

recirc_state_clone() copies the stack and actions and nothing ever freed
them.

CC: Jarno Rajahalme <jarno@ovn.org>
CC: Andy Zhou <azhou@ovn.org>
Reported-by: default avatarWilliam Tu <u9012063@gmail.com>
Reported-at: http://openvswitch.org/pipermail/dev/2016-January/064040.htmlSigned-off-by: default avatarBen Pfaff <blp@ovn.org>
parent 37520ab3
/*
* Copyright (c) 2014, 2015 Nicira, Inc.
* Copyright (c) 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -36,6 +36,8 @@ static uint32_t next_id OVS_GUARDED_BY(mutex); /* Possible next free id. */
#define RECIRC_POOL_STATIC_IDS 1024
static void recirc_id_node_free(struct recirc_id_node *);
void
recirc_init(void)
{
......@@ -88,7 +90,7 @@ recirc_run(void)
* finished. */
LIST_FOR_EACH_POP (node, exp_node, &expired) {
cmap_remove(&id_map, &node->id_node, node->id);
ovsrcu_postpone(free, node);
ovsrcu_postpone(recirc_id_node_free, node);
}
if (!list_is_empty(&expiring)) {
......@@ -222,6 +224,13 @@ recirc_state_clone(struct recirc_state *new, const struct recirc_state *old,
}
}
static void
recirc_state_free(struct recirc_state *state)
{
ofpbuf_delete(state->stack);
free(state->ofpacts);
}
/* Allocate a unique recirculation id for the given set of flow metadata.
* The ID space is 2^^32, so there should never be a situation in which all
* the IDs are used up. We loop until we find a free one.
......@@ -298,6 +307,13 @@ recirc_alloc_id(struct ofproto_dpif *ofproto)
return recirc_alloc_id__(&state, recirc_metadata_hash(&state))->id;
}
static void
recirc_id_node_free(struct recirc_id_node *node)
{
recirc_state_free(CONST_CAST(struct recirc_state *, &node->state));
free(node);
}
void
recirc_id_node_unref(const struct recirc_id_node *node_)
OVS_EXCLUDED(mutex)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment