Commit 27548088 authored by Wu Bo's avatar Wu Bo Committed by Jens Axboe
Browse files

drbd: Fix double free problem in drbd_create_device 



In drbd_create_device(), the 'out_no_io_page' lable has called
blk_cleanup_disk() when return failed.

So remove the 'out_cleanup_disk' lable to avoid double free the
disk pointer.

Fixes: e92ab4ed ("drbd: add error handling support for add_disk()")
Signed-off-by: default avatarWu Bo <wubo40@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/1636013229-26309-1-git-send-email-wubo40@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3aefb5ee

drivers/block/drbd/drbd_main.c

+1 −3
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


	err = add_disk(disk);

	if (err)

		goto out_cleanup_disk;

		goto out_idr_remove_vol;



	/* inherit the connection state */

	device->state.conn = first_connection(resource)->cstate;
@@ -2810,8 +2810,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 
	drbd_debugfs_device_add(device);

	return NO_ERROR;



out_cleanup_disk:

	blk_cleanup_disk(disk);

out_idr_remove_vol:

	idr_remove(&connection->peer_devices, vnr);

out_idr_remove_from_resource: