openvswitch: fix a memory leak
Subsystems (3)
PATCH 1/1 openvswitch: fix a memory leak
From: Li RongQing <[email protected]>
The user_skb maybe be leaked if the operation on it failed and codes skipped into the label "out:" without calling genlmsg_unicast.
Cc Pravin Shelar <[email protected]>
Signed-off-by Li RongQing <[email protected]>
--- net/openvswitch/datapath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +3 -1
@@ -404,7 +404,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, {struct ovs_header *upcall;struct sk_buff *nskb =NULL ; -struct sk_buff *user_skb;/* to be queued to userspace */ +struct sk_buff *user_skb =NULL ;/* to be queued to userspace */ struct nlattr *nla;struct genl_info info = { .dst_sk =ovs_dp_get_net (dp)->genl_sock,
@@ -494,9 +494,11 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, ((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len; err =genlmsg_unicast (ovs_dp_get_net (dp), user_skb, upcall_info->portid); + user_skb =NULL ; out:if (err)skb_tx_error (skb); +kfree_skb (user_skb);kfree_skb (nskb);return err; }
Signature · 1 line
1.7.10.4
Quoted 7 lines · On Tue, Sep 2, 2014 at 5:52 AM, <[email protected]> wrote:
From: Li RongQing <[email protected]>
The
user_skbmaybe be leaked if the operation on it failed and codes skipped into the label "out:" without callinggenlmsg_unicast.Cc Pravin Shelar <[email protected]>Signed-off-by Li RongQing <[email protected]>
Looks good.
Acked-by Pravin B Shelar <[email protected]>
Quoted 32 lines
--- net/openvswitch/datapath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)net/openvswitch/datapath.c +3
-2@@ -404,7 +404,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, {struct ovs_header *upcall;struct sk_buff *nskb =NULL ; -struct sk_buff *user_skb;/* to be queued to userspace */ +struct sk_buff *user_skb =NULL ;/* to be queued to userspace */ struct nlattr *nla;struct genl_info info = { .dst_sk =ovs_dp_get_net (dp)->genl_sock,@@ -494,9 +494,11 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, ((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len; err =genlmsg_unicast (ovs_dp_get_net (dp), user_skb, upcall_info->portid); + user_skb =NULL ; out:if (err)skb_tx_error (skb); +kfree_skb (user_skb);kfree_skb (nskb);return err; } --1.7.10.4
From: [email protected]
Date: Tue, 2 Sep 2014 20:52:28 +0800
Quoted 7 lines
From: Li RongQing <[email protected]>
The
user_skbmaybe be leaked if the operation on it failed and codes skipped into the label "out:" without callinggenlmsg_unicast.Cc Pravin Shelar <[email protected]>Signed-off-by Li RongQing <[email protected]>
Applied.