diff options
| author |   Thierry Escande <thierry.escande@linux.intel.com> | 2013-07-10 10:55:37 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2013-09-25 02:02:40 +0200 |
| commit | 4cf7e032960a945f813784a68bf0b982a4035bf9 (patch) | |
| tree | 744f67660b82de2eb6dd6dd36719602f3a6b6a5a /net/nfc/rawsock.c | |
| parent | NFC: pn533: Staticize local symbols (diff) | |
| download | linux-dev-4cf7e032960a945f813784a68bf0b982a4035bf9.tar.xz linux-dev-4cf7e032960a945f813784a68bf0b982a4035bf9.zip | |
NFC: rawsock: Fix a memory leak
In the rawsock data exchange callback, the sk_buff is not freed
on error.
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/rawsock.c')
| -rw-r--r-- | net/nfc/rawsock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c index 313bf1bc848a..cd958b381f96 100644 --- a/net/nfc/rawsock.c +++ b/net/nfc/rawsock.c @@ -142,11 +142,11 @@ static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb, err = rawsock_add_header(skb); if (err) - goto error; + goto error_skb; err = sock_queue_rcv_skb(sk, skb); if (err) - goto error; + goto error_skb; spin_lock_bh(&sk->sk_write_queue.lock); if (!skb_queue_empty(&sk->sk_write_queue)) @@ -158,6 +158,9 @@ static void rawsock_data_exchange_complete(void *context, struct sk_buff *skb, sock_put(sk); return; +error_skb: + kfree_skb(skb); + error: rawsock_report_error(sk, err); sock_put(sk); |