lkml.org 
[lkml]   [2019]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] net: qrtr: fix memory leak in qrtr_tun_read_iter
Date
In qrtr_tun_read_iter we need an error handling path to appropriately
release skb in cases of error.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
net/qrtr/tun.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c
index e35869e81766..0f6e6d1d2901 100644
--- a/net/qrtr/tun.c
+++ b/net/qrtr/tun.c
@@ -54,19 +54,24 @@ static ssize_t qrtr_tun_read_iter(struct kiocb *iocb, struct iov_iter *to)
int count;

while (!(skb = skb_dequeue(&tun->queue))) {
- if (filp->f_flags & O_NONBLOCK)
- return -EAGAIN;
+ if (filp->f_flags & O_NONBLOCK) {
+ count = -EAGAIN;
+ goto out;
+ }

/* Wait until we get data or the endpoint goes away */
if (wait_event_interruptible(tun->readq,
- !skb_queue_empty(&tun->queue)))
- return -ERESTARTSYS;
+ !skb_queue_empty(&tun->queue))) {
+ count = -ERESTARTSYS;
+ goto out;
+ }
}

count = min_t(size_t, iov_iter_count(to), skb->len);
if (copy_to_iter(skb->data, count, to) != count)
count = -EFAULT;

+out:
kfree_skb(skb);

return count;
--
2.17.1
\
 
 \ /
  Last update: 2019-09-26 01:04    [W:0.045 / U:4.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site