sctp: free cmd->obj.chunk for the unprocessed SCTP_CMD_REPLY
[ Upstream commitbe7a772920
] 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:1da177e4c3
("Linux-2.6.12-rc2") Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2895cea288
commit
50027f1c78
|
@ -1358,8 +1358,10 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type,
|
|||
/* Generate an INIT ACK chunk. */
|
||||
new_obj = sctp_make_init_ack(asoc, chunk, GFP_ATOMIC,
|
||||
0);
|
||||
if (!new_obj)
|
||||
goto nomem;
|
||||
if (!new_obj) {
|
||||
error = -ENOMEM;
|
||||
break;
|
||||
}
|
||||
|
||||
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
|
||||
SCTP_CHUNK(new_obj));
|
||||
|
@ -1381,7 +1383,8 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type,
|
|||
if (!new_obj) {
|
||||
if (cmd->obj.chunk)
|
||||
sctp_chunk_free(cmd->obj.chunk);
|
||||
goto nomem;
|
||||
error = -ENOMEM;
|
||||
break;
|
||||
}
|
||||
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
|
||||
SCTP_CHUNK(new_obj));
|
||||
|
@ -1428,8 +1431,10 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type,
|
|||
|
||||
/* Generate a SHUTDOWN chunk. */
|
||||
new_obj = sctp_make_shutdown(asoc, chunk);
|
||||
if (!new_obj)
|
||||
goto nomem;
|
||||
if (!new_obj) {
|
||||
error = -ENOMEM;
|
||||
break;
|
||||
}
|
||||
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
|
||||
SCTP_CHUNK(new_obj));
|
||||
break;
|
||||
|
@ -1765,11 +1770,17 @@ static int sctp_cmd_interpreter(enum sctp_event_type event_type,
|
|||
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;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
/* 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
|
||||
* send multiple packets in response to a single request.
|
||||
|
@ -1784,7 +1795,4 @@ out:
|
|||
sp->data_ready_signalled = 0;
|
||||
|
||||
return error;
|
||||
nomem:
|
||||
error = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue