netdev - [PATCH/RFC rocker-net-next 4/6] net: flow: free action args

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon,  5 Jan 2015 15:50:08 +0900
From:	Simon Horman <simon.horman@...ronome.com>
To:	John Fastabend <john.fastabend@...il.com>
Cc:	netdev@...r.kernel.org, Simon Horman <simon.horman@...ronome.com>
Subject: [PATCH/RFC rocker-net-next 4/6] net: flow: free action args

Free the args of an action along with the action itself to avoid leaking
memory.

Signed-off-by: Simon Horman <simon.horman@...ronome.com>
---
 net/core/flow_table.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/net/core/flow_table.c b/net/core/flow_table.c
index c734a9d..1a32a72 100644
--- a/net/core/flow_table.c
+++ b/net/core/flow_table.c
@@ -1050,6 +1050,18 @@ static int net_flow_get_field(struct net_flow_field_ref *field,
 	return 0;
 }
 
+static void net_flow_free_actions(struct net_flow_action *actions)
+{
+	int i;
+
+	if (!actions)
+		return;
+
+	for (i = 0; actions[i].uid; i++)
+		kfree(actions[i].args);
+	kfree(actions);
+}
+
 static int net_flow_get_action(struct net_flow_action *a, struct nlattr *attr)
 {
 	struct nlattr *act[NET_FLOW_ACTION_ATTR_MAX+1];
@@ -1168,7 +1180,7 @@ static int net_flow_get_flow(struct net_flow_flow *flow, struct nlattr *attr)
 			err = net_flow_get_action(&flow->actions[count], attr2);
 			if (err) {
 				kfree(flow->matches);
-				kfree(flow->actions);
+				net_flow_free_actions(flow->actions);
 				return err;
 			}
 			count++;
@@ -1251,7 +1263,7 @@ static int net_flow_table_cmd_flows(struct sk_buff *recv_skb,
 
 		/* Cleanup flow */
 		kfree(this.matches);
-		kfree(this.actions);
+		net_flow_free_actions(this.actions);
 
 		if (err && err_handle == NET_FLOW_FLOWS_ERROR_ABORT)
 			goto out;
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html