Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 813a8dd9 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

drbd: use after free in drbd_create_device() 



[ Upstream commit a7a1598189228b5007369a9622ccdf587be0730f ]

The drbd_destroy_connection() frees the "connection" so use the _safe()
iterator to prevent a use after free.

Fixes: b6f85ef9 ("drbd: Iterate over all connections")
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Reviewed-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/Y3Jd5iZRbNQ9w6gm@kili


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0199bf0a

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2778,7 +2778,7 @@ static int init_submitter(struct drbd_device *device) 
enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigned int minor)

{

	struct drbd_resource *resource = adm_ctx->resource;

	struct drbd_connection *connection;

	struct drbd_connection *connection, *n;

	struct drbd_device *device;

	struct drbd_peer_device *peer_device, *tmp_peer_device;

	struct gendisk *disk;
@@ -2906,7 +2906,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 
out_idr_remove_vol:

	idr_remove(&connection->peer_devices, vnr);

out_idr_remove_from_resource:

	for_each_connection(connection, resource) {

	for_each_connection_safe(connection, n, resource) {

		peer_device = idr_remove(&connection->peer_devices, vnr);

		if (peer_device)

			kref_put(&connection->kref, drbd_destroy_connection);