Skip to contentSkip to conversation

net: qrtr: fix memort leak in qrtr_tun_write_iter

PATCH Superseded Navid Emamdoost 2 participants 4 messages Sep 11, 2019 – Sep 12, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: qrtr: fix memort leak in qrtr_tun_write_iter

In qrtr_tun_write_iter the allocated kbuf should be release in case of error happening.

---
 net/qrtr/tun.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
net/qrtr/tun.c +8 -2
index ccff1e544c21..1dba8b92560e 100644
@@ -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)
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/1 net: qrtr: fix memort leak in qrtr_tun_write_iter

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.

---
 net/qrtr/tun.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
net/qrtr/tun.c +4 -1
index ccff1e544c21..e35869e81766 100644
@@ -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;
 }
 
Signature · 1 line
2.17.1
maintainer Applied
#3 lore raw

From: Navid Emamdoost <[email protected]>
Date: Wed, 11 Sep 2019 10:09:02 -0500

Quoted 7 lines

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.

Applied, thanks.