Commit 7904fa63 authored by Xin Long's avatar Xin Long Committed by Khalid Elmously

sctp: free cmd->obj.chunk for the unprocessed SCTP_CMD_REPLY

BugLink: https://bugs.launchpad.net/bugs/1859640

[ Upstream commit be7a7729 ]

This patch is to fix a memleak caused by no place to free cmd->obj.chunk
for the unprocessed SCTP_CMD_REPLY. This issue occurs when failing to
process a cmd while there're still SCTP_CMD_REPLY cmds on the cmd seq
with an allocated chunk in cmd->obj.chunk.

So fix it by freeing cmd->obj.chunk for each SCTP_CMD_REPLY cmd left on
the cmd seq when any cmd returns error. While at it, also remove 'nomem'
label.

Reported-by: syzbot+107c4aff5f392bf1517f@syzkaller.appspotmail.com
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent c0817616
...@@ -1333,8 +1333,10 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1333,8 +1333,10 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
/* Generate an INIT ACK chunk. */ /* Generate an INIT ACK chunk. */
new_obj = sctp_make_init_ack(asoc, chunk, GFP_ATOMIC, new_obj = sctp_make_init_ack(asoc, chunk, GFP_ATOMIC,
0); 0);
if (!new_obj) if (!new_obj) {
goto nomem; error = -ENOMEM;
break;
}
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
SCTP_CHUNK(new_obj)); SCTP_CHUNK(new_obj));
...@@ -1356,7 +1358,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1356,7 +1358,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
if (!new_obj) { if (!new_obj) {
if (cmd->obj.chunk) if (cmd->obj.chunk)
sctp_chunk_free(cmd->obj.chunk); sctp_chunk_free(cmd->obj.chunk);
goto nomem; error = -ENOMEM;
break;
} }
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
SCTP_CHUNK(new_obj)); SCTP_CHUNK(new_obj));
...@@ -1403,8 +1406,10 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1403,8 +1406,10 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
/* Generate a SHUTDOWN chunk. */ /* Generate a SHUTDOWN chunk. */
new_obj = sctp_make_shutdown(asoc, chunk); new_obj = sctp_make_shutdown(asoc, chunk);
if (!new_obj) if (!new_obj) {
goto nomem; error = -ENOMEM;
break;
}
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
SCTP_CHUNK(new_obj)); SCTP_CHUNK(new_obj));
break; break;
...@@ -1733,11 +1738,17 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1733,11 +1738,17 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
break; break;
} }
if (error) if (error) {
cmd = sctp_next_cmd(commands);
while (cmd) {
if (cmd->verb == SCTP_CMD_REPLY)
sctp_chunk_free(cmd->obj.chunk);
cmd = sctp_next_cmd(commands);
}
break; break;
}
} }
out:
/* If this is in response to a received chunk, wait until /* If this is in response to a received chunk, wait until
* we are done with the packet to open the queue so that we don't * we are done with the packet to open the queue so that we don't
* send multiple packets in response to a single request. * send multiple packets in response to a single request.
...@@ -1748,8 +1759,5 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1748,8 +1759,5 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
} else if (local_cork) } else if (local_cork)
error = sctp_outq_uncork(&asoc->outqueue); error = sctp_outq_uncork(&asoc->outqueue);
return error; return error;
nomem:
error = -ENOMEM;
goto out;
} }
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