linux-kernel - [PATCH] Block: mtip32xx: Improvement in code readability when memdup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 11 Nov 2016 14:34:51 +0530
From:   Sachin Shukla <sachin.s5@...sung.com>
To:     Jens Axboe <axboe@...com>,
        Asai Thambi SP <asamymuthupa@...ron.com>,
        Selvan Mani <smani@...ron.com>,
        Rajesh Kumar Sambandam <rsambandam@...ron.com>,
        Vignesh Gunasekaran <vgunasekaran@...ron.com>,
        Al Viro <viro@...iv.linux.org.uk>,
        linux-kernel@...r.kernel.org, sachiniiitm@...il.com
Cc:     ravikant.s2@...sung.com, p.shailesh@...sung.com,
        ashish.kalra@...sung.com, vidushi.koul@...sung.com
Subject: [PATCH] Block: mtip32xx: Improvement in code readability when
 memdup_user() fails.

From: "Sachin Shukla" <sachin.s5@...sung.com>

There is no need to call kfree() if memdup_user() fails, as no memory
was allocated and the error in the error-valued pointer should be returned.

Signed-off-by: Sachin Shukla <sachin.s5@...sung.com>
---
 drivers/block/mtip32xx/mtip32xx.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 3cfd879..68e332b 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2035,18 +2035,14 @@ static int exec_drive_taskfile(struct driver_data *dd,
 	taskout = req_task->out_size;
 	taskin = req_task->in_size;
 	/* 130560 = 512 * 0xFF*/
-	if (taskin > 130560 || taskout > 130560) {
-		err = -EINVAL;
-		goto abort;
-	}
+	if (taskin > 130560 || taskout > 130560)
+		return -EINVAL;
 
 	if (taskout) {
 		outbuf = memdup_user(buf + outtotal, taskout);
-		if (IS_ERR(outbuf)) {
-			err = PTR_ERR(outbuf);
-			outbuf = NULL;
-			goto abort;
-		}
+		if (IS_ERR(outbuf))
+			return PTR_ERR(outbuf);
+
 		outbuf_dma = pci_map_single(dd->pdev,
 					 outbuf,
 					 taskout,
-- 
1.7.9.5