All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Elder <elder@inktank.com>
To: "ceph-devel@vger.kernel.org" <ceph-devel@vger.kernel.org>
Subject: [PATCH 2/3] rbd: ensure invalid pointers are made null
Date: Mon, 06 Aug 2012 11:03:38 -0700	[thread overview]
Message-ID: <502006FA.3000801@inktank.com> (raw)
In-Reply-To: <50200691.3040006@inktank.com>

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>
---
  drivers/block/rbd.c |   10 ++++++++++
  1 file changed, 10 insertions(+)

Index: b/drivers/block/rbd.c
===================================================================
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -569,6 +569,7 @@ err_sizes:
  err_names:
  	kfree(header->snap_names);
  	header->snap_names = NULL;
+	header->snap_names_len = 0;
  err_snapc:
  	kfree(header->snapc);
  	header->snapc = NULL;
@@ -632,9 +633,14 @@ done:
  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;
  }

  /*
@@ -2444,7 +2450,10 @@ static int rbd_add_parse_args(struct rbd

  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;

@@ -2496,6 +2505,7 @@ static ssize_t rbd_add(struct bus_type *
  						options);
  	if (IS_ERR(rbd_dev->rbd_client)) {
  		rc = PTR_ERR(rbd_dev->rbd_client);
+		rbd_dev->rbd_client = NULL;
  		goto err_put_id;
  	}


  parent reply	other threads:[~2012-08-06 18:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-06 18:01 [PATCH 0/3] rbd: a few small cleanups Alex Elder
2012-08-06 18:03 ` [PATCH 1/3] rbd: make snap_names_len a u64 Alex Elder
2012-08-06 18:03 ` Alex Elder [this message]
2012-08-06 18:03 ` [PATCH 3/3] rbd: use sizeof (object) instead of sizeof (type) Alex Elder
2012-08-07 23:28 ` [PATCH 0/3] rbd: a few small cleanups Josh Durgin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=502006FA.3000801@inktank.com \
    --to=elder@inktank.com \
    --cc=ceph-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.