All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Elder <elder@inktank.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Sage Weil <sage@newdream.net>,
	ceph-devel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch -next] libceph: fix NULL dereference in reset_connection()
Date: Tue, 19 Jun 2012 13:27:19 +0000	[thread overview]
Message-ID: <4FE07E37.7000203@inktank.com> (raw)
In-Reply-To: <20120619103339.GB7596@elgon.mountain>

On 06/19/2012 05:33 AM, Dan Carpenter wrote:
> We dereference "con->in_msg" on the line after it was set to NULL.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Yikes.

Actually I think I prefer a different fix, which is
simply to call ceph_con_put(con) in the same spot
it was called with con->in_msg->con before.  I'd
rather drop the message reference before dropping
the connection reference.  I.e.:

@@ -440,7 +440,7 @@ static void reset_connection(struct ceph_connection
*con)
 		con->in_msg->con = NULL;
 		ceph_msg_put(con->in_msg);
 		con->in_msg = NULL;
-		ceph_con_put(con->in_msg->con);
+		ceph_con_put(con);
 	}

 	con->connect_seq = 0;

(I crafted that manually--it may not work...)

I will re-post that fix and will credit you with it.  Please acknowledge
it's OK with you though.  Thanks a lot.

					-Alex

> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index 5e9f61d..6aa671c 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -437,10 +437,10 @@ static void reset_connection(struct ceph_connection *con)
>  
>  	if (con->in_msg) {
>  		BUG_ON(con->in_msg->con != con);
> +		ceph_con_put(con->in_msg->con);
>  		con->in_msg->con = NULL;
>  		ceph_msg_put(con->in_msg);
>  		con->in_msg = NULL;
> -		ceph_con_put(con->in_msg->con);
>  	}
>  
>  	con->connect_seq = 0;
> 


WARNING: multiple messages have this Message-ID (diff)
From: Alex Elder <elder@inktank.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Sage Weil <sage@newdream.net>,
	ceph-devel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch -next] libceph: fix NULL dereference in reset_connection()
Date: Tue, 19 Jun 2012 08:27:19 -0500	[thread overview]
Message-ID: <4FE07E37.7000203@inktank.com> (raw)
In-Reply-To: <20120619103339.GB7596@elgon.mountain>

On 06/19/2012 05:33 AM, Dan Carpenter wrote:
> We dereference "con->in_msg" on the line after it was set to NULL.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Yikes.

Actually I think I prefer a different fix, which is
simply to call ceph_con_put(con) in the same spot
it was called with con->in_msg->con before.  I'd
rather drop the message reference before dropping
the connection reference.  I.e.:

@@ -440,7 +440,7 @@ static void reset_connection(struct ceph_connection
*con)
 		con->in_msg->con = NULL;
 		ceph_msg_put(con->in_msg);
 		con->in_msg = NULL;
-		ceph_con_put(con->in_msg->con);
+		ceph_con_put(con);
 	}

 	con->connect_seq = 0;

(I crafted that manually--it may not work...)

I will re-post that fix and will credit you with it.  Please acknowledge
it's OK with you though.  Thanks a lot.

					-Alex

> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index 5e9f61d..6aa671c 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -437,10 +437,10 @@ static void reset_connection(struct ceph_connection *con)
>  
>  	if (con->in_msg) {
>  		BUG_ON(con->in_msg->con != con);
> +		ceph_con_put(con->in_msg->con);
>  		con->in_msg->con = NULL;
>  		ceph_msg_put(con->in_msg);
>  		con->in_msg = NULL;
> -		ceph_con_put(con->in_msg->con);
>  	}
>  
>  	con->connect_seq = 0;
> 


  reply	other threads:[~2012-06-19 13:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-19 10:33 [patch -next] libceph: fix NULL dereference in reset_connection() Dan Carpenter
2012-06-19 10:33 ` Dan Carpenter
2012-06-19 13:27 ` Alex Elder [this message]
2012-06-19 13:27   ` Alex Elder
2012-06-19 13:33   ` Dan Carpenter
2012-06-19 13:33     ` Dan Carpenter
2012-06-19 13:57     ` [PATCH] " Alex Elder
2012-06-19 13:57       ` Alex Elder

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=4FE07E37.7000203@inktank.com \
    --to=elder@inktank.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=dan.carpenter@oracle.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=sage@newdream.net \
    /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.