summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter2012-06-19 15:52:33 +0200
committerAlex Elder2012-06-19 15:52:33 +0200
commit26ce171915f348abd1f41da1ed139d93750d987f (patch)
tree4f8766c8bbfc3a81089a60e9b7e1e9d0b9ef51eb /net
parentMerge tag 'v3.5-rc1' (diff)
downloadkernel-qcow2-linux-26ce171915f348abd1f41da1ed139d93750d987f.tar.gz
kernel-qcow2-linux-26ce171915f348abd1f41da1ed139d93750d987f.tar.xz
kernel-qcow2-linux-26ce171915f348abd1f41da1ed139d93750d987f.zip
libceph: fix NULL dereference in reset_connection()
We dereference "con->in_msg" on the line after it was set to NULL. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 5e9f61d6d234..23073cff6481 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -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;