Skip to content

L
linux-davinci
Commit 5e095e8b authored by Sage Weil's avatar Sage Weil
Browse files
Options

ceph: plug msg leak in con_fault 

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent c86a2930
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
fs/ceph/messenger.c
View file @ 5e095e8b
...@@ -1434,8 +1434,9 @@ no_data: ...@@ -1434,8 +1434,9 @@ no_data:
*/ */
static void process_message(struct ceph_connection *con) static void process_message(struct ceph_connection *con)
{ {
struct ceph_msg *msg = con->in_msg; struct ceph_msg *msg;
msg = con->in_msg;
con->in_msg = NULL; con->in_msg = NULL;
/* if first message, set peer_name */ /* if first message, set peer_name */
...@@ -1810,7 +1811,11 @@ static void ceph_fault(struct ceph_connection *con) ...@@ -1810,7 +1811,11 @@ static void ceph_fault(struct ceph_connection *con)
clear_bit(BUSY, &con->state); /* to avoid an improbable race */ clear_bit(BUSY, &con->state); /* to avoid an improbable race */
con_close_socket(con); con_close_socket(con);
con->in_msg = NULL;
if (con->in_msg) {
ceph_msg_put(con->in_msg);
con->in_msg = NULL;
}
/* If there are no messages in the queue, place the connection /* If there are no messages in the queue, place the connection
* in a STANDBY state (i.e., don't try to reconnect just yet). */ * in a STANDBY state (i.e., don't try to reconnect just yet). */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment