From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 21 Jul 2021 10:16:26 +0000 (+0200)
Subject: rbd: resurrect setting of disk->private_data in rbd_init_disk()
X-Git-Tag: accepted/tizen/unified/20230118.172025~6767^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0077a50082729c3f9ea2836f59e35d9b7dacfb12;p=platform%2Fkernel%2Flinux-rpi.git

rbd: resurrect setting of disk->private_data in rbd_init_disk()

rbd_open() and rbd_release() expect that disk->private_data is set to
rbd_dev.  Otherwise we hit a NULL pointer dereference when mapping the
image.

URL: https://tracker.ceph.com/issues/51759
Fixes: 195b1956b85b ("rbd: use blk_mq_alloc_disk and blk_cleanup_disk")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 784797f..90b947c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4943,6 +4943,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 		disk->minors = RBD_MINORS_PER_MAJOR;
 	}
 	disk->fops = &rbd_bd_ops;
+	disk->private_data = rbd_dev;
 
 	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
 	/* QUEUE_FLAG_ADD_RANDOM is off by default for blk-mq */