[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190920160644.GA15739@asgard.redhat.com>
Date: Fri, 20 Sep 2019 18:06:44 +0200
From: Eugene Syromiatnikov <esyr@...hat.com>
To: linux-block@...r.kernel.org, Josef Bacik <josef@...icpanda.com>,
nbd@...er.debian.org
Cc: linux-kernel@...r.kernel.org, Jens Axboe <axboe@...nel.dk>
Subject: [PATCH RESEND] nbd: avoid losing pointer to reallocated
config->socks in nbd_add_socket
In the (very unlikely) case of config->socks reallocation success
and nsock allocation failure config->nsock will not get updated
with the new pointer to socks array. Fix it by updating config->socks
right after reallocation successfulness check.
Fixes: 9561a7ade0c2 ("nbd: add multi-connection support")
Signed-off-by: Eugene Syromiatnikov <esyr@...hat.com>
Cc: stable@...r.kernel.org # 4.10+
---
drivers/block/nbd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a8e3815..a04c686 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -987,14 +987,14 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,
sockfd_put(sock);
return -ENOMEM;
}
+ config->socks = socks;
+
nsock = kzalloc(sizeof(struct nbd_sock), GFP_KERNEL);
if (!nsock) {
sockfd_put(sock);
return -ENOMEM;
}
- config->socks = socks;
-
nsock->fallback_index = -1;
nsock->dead = false;
mutex_init(&nsock->tx_lock);
--
2.1.4
Powered by blists - more mailing lists