* [PATCH] net: qrtr: fix memort leak in qrtr_tun_write_iter
@ 2019-09-11 0:37 Navid Emamdoost
2019-09-11 8:13 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Navid Emamdoost @ 2019-09-11 0:37 UTC (permalink / raw)
Cc: emamd001, smccaman, kjlu, Navid Emamdoost, David S. Miller,
netdev, linux-kernel
In qrtr_tun_write_iter the allocated kbuf should be release in case of
error happening.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
net/qrtr/tun.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c
index ccff1e544c21..1dba8b92560e 100644
--- a/net/qrtr/tun.c
+++ b/net/qrtr/tun.c
@@ -84,12 +84,18 @@ static ssize_t qrtr_tun_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (!kbuf)
return -ENOMEM;
- if (!copy_from_iter_full(kbuf, len, from))
+ if (!copy_from_iter_full(kbuf, len, from)) {
+ kfree(kbuf);
return -EFAULT;
+ }
ret = qrtr_endpoint_post(&tun->ep, kbuf, len);
+ if (ret < 0) {
+ kfree(kbuf);
+ return ret;
+ }
- return ret < 0 ? ret : len;
+ return len;
}
static __poll_t qrtr_tun_poll(struct file *filp, poll_table *wait)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: qrtr: fix memort leak in qrtr_tun_write_iter
2019-09-11 0:37 [PATCH] net: qrtr: fix memort leak in qrtr_tun_write_iter Navid Emamdoost
@ 2019-09-11 8:13 ` David Miller
2019-09-11 15:09 ` [PATCH v2] " Navid Emamdoost
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2019-09-11 8:13 UTC (permalink / raw)
To: navid.emamdoost; +Cc: emamd001, smccaman, kjlu, netdev, linux-kernel
From: Navid Emamdoost <navid.emamdoost@gmail.com>
Date: Tue, 10 Sep 2019 19:37:45 -0500
> In qrtr_tun_write_iter the allocated kbuf should be release in case of
> error happening.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Shouldn't it also be freed in case of success too?
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] net: qrtr: fix memort leak in qrtr_tun_write_iter
2019-09-11 8:13 ` David Miller
@ 2019-09-11 15:09 ` Navid Emamdoost
2019-09-12 10:59 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Navid Emamdoost @ 2019-09-11 15:09 UTC (permalink / raw)
To: davem; +Cc: emamd001, smccaman, kjlu, Navid Emamdoost, netdev, linux-kernel
In qrtr_tun_write_iter the allocated kbuf should be release in case of
error or success return.
v2 Update: Thanks to David Miller for pointing out the release on success
path as well.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
net/qrtr/tun.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c
index ccff1e544c21..e35869e81766 100644
--- a/net/qrtr/tun.c
+++ b/net/qrtr/tun.c
@@ -84,11 +84,14 @@ static ssize_t qrtr_tun_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (!kbuf)
return -ENOMEM;
- if (!copy_from_iter_full(kbuf, len, from))
+ if (!copy_from_iter_full(kbuf, len, from)) {
+ kfree(kbuf);
return -EFAULT;
+ }
ret = qrtr_endpoint_post(&tun->ep, kbuf, len);
+ kfree(kbuf);
return ret < 0 ? ret : len;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] net: qrtr: fix memort leak in qrtr_tun_write_iter
2019-09-11 15:09 ` [PATCH v2] " Navid Emamdoost
@ 2019-09-12 10:59 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-09-12 10:59 UTC (permalink / raw)
To: navid.emamdoost; +Cc: emamd001, smccaman, kjlu, netdev, linux-kernel
From: Navid Emamdoost <navid.emamdoost@gmail.com>
Date: Wed, 11 Sep 2019 10:09:02 -0500
> In qrtr_tun_write_iter the allocated kbuf should be release in case of
> error or success return.
>
> v2 Update: Thanks to David Miller for pointing out the release on success
> path as well.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-12 10:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-11 0:37 [PATCH] net: qrtr: fix memort leak in qrtr_tun_write_iter Navid Emamdoost
2019-09-11 8:13 ` David Miller
2019-09-11 15:09 ` [PATCH v2] " Navid Emamdoost
2019-09-12 10:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).