diff options
author | Tommi Rantala <tt.rantala@gmail.com> | 2012-11-26 23:01:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-28 11:10:09 -0500 |
commit | be364c8c0f17a3dd42707b5a090b318028538eb9 (patch) | |
tree | 9dc717f011a3b13666920cb0df741d6c6667ad28 /net/sctp | |
parent | b49d3c1e1c948d76d64790abe9acffa9fa747d19 (diff) |
sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails
Trinity (the syscall fuzzer) discovered a memory leak in SCTP,
reproducible e.g. with the sendto() syscall by passing invalid
user space pointer in the second argument:
#include <string.h>
#include <arpa/inet.h>
#include <sys/socket.h>
int main(void)
{
int fd;
struct sockaddr_in sa;
fd = socket(AF_INET, SOCK_STREAM, 132 /*IPPROTO_SCTP*/);
if (fd < 0)
return 1;
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = inet_addr("127.0.0.1");
sa.sin_port = htons(11111);
sendto(fd, NULL, 1, 0, (struct sockaddr *)&sa, sizeof(sa));
return 0;
}
As far as I can tell, the leak has been around since ~2003.
Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/chunk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 7c2df9c33df3..f2aebdbb1eda 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c | |||
@@ -284,7 +284,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, | |||
284 | goto errout; | 284 | goto errout; |
285 | err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov); | 285 | err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov); |
286 | if (err < 0) | 286 | if (err < 0) |
287 | goto errout; | 287 | goto errout_chunk_free; |
288 | 288 | ||
289 | offset += len; | 289 | offset += len; |
290 | 290 | ||
@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, | |||
324 | __skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr | 324 | __skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr |
325 | - (__u8 *)chunk->skb->data); | 325 | - (__u8 *)chunk->skb->data); |
326 | if (err < 0) | 326 | if (err < 0) |
327 | goto errout; | 327 | goto errout_chunk_free; |
328 | 328 | ||
329 | sctp_datamsg_assign(msg, chunk); | 329 | sctp_datamsg_assign(msg, chunk); |
330 | list_add_tail(&chunk->frag_list, &msg->chunks); | 330 | list_add_tail(&chunk->frag_list, &msg->chunks); |
@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, | |||
332 | 332 | ||
333 | return msg; | 333 | return msg; |
334 | 334 | ||
335 | errout_chunk_free: | ||
336 | sctp_chunk_free(chunk); | ||
337 | |||
335 | errout: | 338 | errout: |
336 | list_for_each_safe(pos, temp, &msg->chunks) { | 339 | list_for_each_safe(pos, temp, &msg->chunks) { |
337 | list_del_init(pos); | 340 | list_del_init(pos); |