linux-kernel - [PATCH -next] nbd: fix return value check

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>] [day] [month] [year] [list]

Message-Id: <1473909983-30866-1-git-send-email-weiyj.lk@gmail.com>
Date:   Thu, 15 Sep 2016 03:26:23 +0000
From:   Wei Yongjun <weiyj.lk@...il.com>
To:     Markus Pargmann <mpa@...gutronix.de>, Josef Bacik <jbacik@...com>
Cc:     Wei Yongjun <weiyongjun1@...wei.com>,
        nbd-general@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: [PATCH -next] nbd: fix return value check

From: Wei Yongjun <weiyongjun1@...wei.com>

In case of error, the function blk_mq_alloc_request() or
blk_mq_init_queue() returns ERR_PTR() not  NULL. The NULL
test in the return value check should be replaced with
IS_ERR().

Fixes: fd8383fd88a2 ("nbd: convert to blkmq")
Signed-off-by: Wei Yongjun <weiyongjun1@...wei.com>
---
 drivers/block/nbd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4c6dd1a..62ff9cb 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -599,8 +599,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
 			return -EINVAL;
 
 		sreq = blk_mq_alloc_request(bdev_get_queue(bdev), WRITE, 0);
-		if (!sreq)
-			return -ENOMEM;
+		if (IS_ERR(sreq))
+			return PTR_ERR(sreq);
 
 		mutex_unlock(&nbd->tx_lock);
 		fsync_bdev(bdev);
@@ -956,7 +956,8 @@ static int __init nbd_init(void)
 		 * These structs are big so we dynamically allocate them.
 		 */
 		disk->queue = blk_mq_init_queue(&nbd_dev[i].tag_set);
-		if (!disk->queue) {
+		if (IS_ERR(disk->queue)) {
+			err = PTR_ERR(disk->queue);
 			blk_mq_free_tag_set(&nbd_dev[i].tag_set);
 			put_disk(disk);
 			goto out;