leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: plug leak of incoming message during connection fault/close

Browse Source 
If we explicitly close a connection, or there is a socket error, we need
to drop any partially received message.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2009-12-11 09:48:05 -08:00
parent 9ec7cab14e
commit cf3e5c409b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ceph/messenger.c
View File

@ -320,6 +320,11 @@ static void reset_connection(struct ceph_connection *con)
ceph_msg_remove_list(&con->out_queue);
ceph_msg_remove_list(&con->out_sent);
if (con->in_msg) {
ceph_msg_put(con->in_msg);
con->in_msg = NULL;
}
con->connect_seq = 0;
con->out_seq = 0;
if (con->out_msg) {
@ -1288,7 +1293,7 @@ static int read_partial_message(struct ceph_connection *con)
con->in_msg = con->ops->alloc_msg(con, &con->in_hdr);
if (!con->in_msg) {
/* skip this message */
dout("alloc_msg returned NULL, skipping message\n");
pr_err("alloc_msg returned NULL, skipping message\n");
con->in_base_pos = -front_len - middle_len - data_len -
sizeof(m->footer);
con->in_tag = CEPH_MSGR_TAG_READY;
@ -1327,7 +1332,7 @@ static int read_partial_message(struct ceph_connection *con)
if (con->ops->alloc_middle)
ret = con->ops->alloc_middle(con, m);
if (ret < 0) {
dout("alloc_middle failed, skipping payload\n");
pr_err("alloc_middle fail skipping payload\n");
con->in_base_pos = -middle_len - data_len
- sizeof(m->footer);
ceph_msg_put(con->in_msg);
@ -1498,6 +1503,7 @@ more:
set_bit(CONNECTING, &con->state);
clear_bit(NEGOTIATING, &con->state);
BUG_ON(con->in_msg);
con->in_tag = CEPH_MSGR_TAG_READY;
dout("try_write initiating connect on %p new state %lu\n",
con, con->state);