diff options
| author | Li RongQing <roy.qing.li@gmail.com> | 2014-09-02 20:52:28 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-02 14:01:21 -0700 |
| commit | 4ee45ea05c8710c7ab8a5eb1a72700b874712746 (patch) | |
| tree | c2a32f22db45511bfd6c896759bbbe5e15136032 /net/openvswitch | |
| parent | 41ad82f7f8f59a472c8e8ccca56a9c6bdf3c5092 (diff) | |
| download | blackbird-op-linux-4ee45ea05c8710c7ab8a5eb1a72700b874712746.tar.gz blackbird-op-linux-4ee45ea05c8710c7ab8a5eb1a72700b874712746.zip | |
openvswitch: fix a memory leak
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 <pshelar@nicira.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/datapath.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 7228ec3faf19..35d866f036e7 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -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; } |
