From: Gustavo A. R. Silva <gustavo@embeddedor.com>
Date: Mon, 12 Feb 2018 17:14:55 +0000 (-0600)
Subject: nbd: fix return value in error handling path
X-Git-Tag: v4.16-rc4~16^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0979962f5490abe75b3e2befb07a564fa0cf631b;p=thirdparty%2Flinux.git

nbd: fix return value in error handling path

It seems that the proper value to return in this particular case is the
one contained into variable new_index instead of ret.

Addresses-Coverity-ID: 1465148 ("Copy-paste error")
Fixes: e46c7287b1c2 ("nbd: add a basic netlink interface")
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5f2a4240a204d..86258b00a1d4d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1591,7 +1591,7 @@ again:
 			if (new_index < 0) {
 				mutex_unlock(&nbd_index_mutex);
 				printk(KERN_ERR "nbd: failed to add new device\n");
-				return ret;
+				return new_index;
 			}
 			nbd = idr_find(&nbd_index_idr, new_index);
 		}