Skip to content

Commit

Permalink
rbd: ensure invalid pointers are made null
Browse files Browse the repository at this point in the history
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: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
  • Loading branch information
Alex Elder committed Oct 1, 2012
1 parent 0f1d3f9 commit d78fd7a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
err_names:
kfree(header->snap_names);
header->snap_names = NULL;
header->snap_names_len = 0;
err_snapc:
kfree(header->snapc);
header->snapc = NULL;
Expand Down Expand Up @@ -631,9 +632,14 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
static void rbd_header_free(struct rbd_image_header *header)
{
kfree(header->object_prefix);
header->object_prefix = NULL;
kfree(header->snap_sizes);
header->snap_sizes = NULL;
kfree(header->snap_names);
header->snap_names = NULL;
header->snap_names_len = 0;
ceph_put_snap_context(header->snapc);
header->snapc = NULL;
}

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

out_err:
kfree(rbd_dev->header_name);
rbd_dev->header_name = NULL;
kfree(rbd_dev->image_name);
rbd_dev->image_name = NULL;
rbd_dev->image_name_len = 0;
kfree(rbd_dev->pool_name);
rbd_dev->pool_name = NULL;

Expand Down Expand Up @@ -2470,6 +2479,7 @@ static ssize_t rbd_add(struct bus_type *bus,
options);
if (IS_ERR(rbd_dev->rbd_client)) {
rc = PTR_ERR(rbd_dev->rbd_client);
rbd_dev->rbd_client = NULL;
goto err_put_id;
}

Expand Down

0 comments on commit d78fd7a

Please sign in to comment.