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

Commit d78fd7ae authored by Alex Elder's avatar Alex Elder
Browse files

rbd: ensure invalid pointers are made null 



Fix a number of spots where a pointer value that is known to
have become invalid but was not reset to null.

Also, toss in a change so we use sizeof (object) rather than
sizeof (type).

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 0f1d3f93

drivers/block/rbd.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -568,6 +568,7 @@ err_sizes: 
err_names:

err_names:

	kfree(header->snap_names);

	kfree(header->snap_names);

	header->snap_names = NULL;

	header->snap_names = NULL;

	header->snap_names_len = 0;

err_snapc:

err_snapc:

	kfree(header->snapc);

	kfree(header->snapc);

	header->snapc = NULL;

	header->snapc = NULL;
@@ -631,9 +632,14 @@ done: 
static void rbd_header_free(struct rbd_image_header *header)

static void rbd_header_free(struct rbd_image_header *header)

{

{

	kfree(header->object_prefix);

	kfree(header->object_prefix);

	header->object_prefix = NULL;

	kfree(header->snap_sizes);

	kfree(header->snap_sizes);

	header->snap_sizes = NULL;

	kfree(header->snap_names);

	kfree(header->snap_names);

	header->snap_names = NULL;

	header->snap_names_len = 0;

	ceph_put_snap_context(header->snapc);

	ceph_put_snap_context(header->snapc);

	header->snapc = NULL;

}

}





/*

/*
@@ -2418,7 +2424,10 @@ static int rbd_add_parse_args(struct rbd_device *rbd_dev, 




out_err:

out_err:

	kfree(rbd_dev->header_name);

	kfree(rbd_dev->header_name);

	rbd_dev->header_name = NULL;

	kfree(rbd_dev->image_name);

	kfree(rbd_dev->image_name);

	rbd_dev->image_name = NULL;

	rbd_dev->image_name_len = 0;

	kfree(rbd_dev->pool_name);

	kfree(rbd_dev->pool_name);

	rbd_dev->pool_name = NULL;

	rbd_dev->pool_name = NULL;
@@ -2470,6 +2479,7 @@ static ssize_t rbd_add(struct bus_type *bus, 
						options);

						options);

	if (IS_ERR(rbd_dev->rbd_client)) {

	if (IS_ERR(rbd_dev->rbd_client)) {

		rc = PTR_ERR(rbd_dev->rbd_client);

		rc = PTR_ERR(rbd_dev->rbd_client);

		rbd_dev->rbd_client = NULL;

		goto err_put_id;

		goto err_put_id;

	}

	}