From: xiangxia.m.yue@gmail.com
To: gvrose8192@gmail.com, pshelar@ovn.org
Cc: netdev@vger.kernel.org, dev@openvswitch.org,
Tonghao Zhang <xiangxia.m.yue@gmail.com>
Subject: [PATCH net-next v3 08/10] net: openvswitch: fix possible memleak on destroy flow-table
Date: Fri, 11 Oct 2019 22:00:45 +0800 [thread overview]
Message-ID: <1570802447-8019-9-git-send-email-xiangxia.m.yue@gmail.com> (raw)
In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com>
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
When we destroy the flow tables which may contain the flow_mask,
so release the flow mask struct.
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
net/openvswitch/flow_table.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index 1fc6be2..0317f1c 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -293,6 +293,18 @@ static void table_instance_destroy(struct table_instance *ti,
}
}
+static void tbl_mask_array_destroy(struct flow_table *tbl)
+{
+ struct mask_array *ma = ovsl_dereference(tbl->mask_array);
+ int i;
+
+ /* Free the flow-mask and kfree_rcu the NULL is allowed. */
+ for (i = 0; i < ma->count; i++)
+ kfree_rcu(ma->masks[i], rcu);
+
+ kfree_rcu(tbl->mask_array, rcu);
+}
+
/* No need for locking this function is called from RCU callback or
* error path.
*/
@@ -302,7 +314,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table)
struct table_instance *ufid_ti = rcu_dereference_raw(table->ufid_ti);
free_percpu(table->mask_cache);
- kfree_rcu(table->mask_array, rcu);
+ tbl_mask_array_destroy(table);
table_instance_destroy(ti, ufid_ti, false);
}
--
1.8.3.1
next prev parent reply other threads:[~2019-10-11 14:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 14:00 [PATCH net-next v3 00/10] optimize openvswitch flow looking up xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 01/10] net: openvswitch: add flow-mask cache for performance xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 02/10] net: openvswitch: convert mask list in mask array xiangxia.m.yue
2019-10-13 10:58 ` kbuild test robot
2019-10-11 14:00 ` [PATCH net-next v3 03/10] net: openvswitch: shrink the mask array if necessary xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 04/10] net: openvswitch: optimize flow mask cache hash collision xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 05/10] net: openvswitch: optimize flow-mask looking up xiangxia.m.yue
2019-10-14 7:02 ` Pravin Shelar
2019-10-11 14:00 ` [PATCH net-next v3 06/10] net: openvswitch: simplify the flow_hash xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 07/10] net: openvswitch: add likely in flow_lookup xiangxia.m.yue
2019-10-11 14:00 ` xiangxia.m.yue [this message]
2019-10-11 14:00 ` [PATCH net-next v3 09/10] net: openvswitch: don't unlock mutex when changing the user_features fails xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 10/10] net: openvswitch: simplify the ovs_dp_cmd_new xiangxia.m.yue
2019-10-15 20:01 ` [PATCH net-next v3 00/10] optimize openvswitch flow looking up Gregory Rose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1570802447-8019-9-git-send-email-xiangxia.m.yue@gmail.com \
--to=xiangxia.m.yue@gmail.com \
--cc=dev@openvswitch.org \
--cc=gvrose8192@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pshelar@ovn.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).