[PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

Subsystems: networking [general], sctp protocol, the rest

STALE5034d

8 messages, 4 authors, 2012-11-28 · open the first message on its own page

[PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: Tommi Rantala <hidden>
Date: 2012-11-22 20:23:01

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 <redacted>
---
 net/sctp/chunk.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7c2df9c..d241ef5 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,
 			goto errout;
 		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;
 
 		offset += len;

@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 		__skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr
 			   - (__u8 *)chunk->skb->data);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;
 
 		sctp_datamsg_assign(msg, chunk);
 		list_add_tail(&chunk->frag_list, &msg->chunks);

@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 	return msg;
 
+errout_chunk_put:
+	sctp_chunk_put(chunk);
+
 errout:
 	list_for_each_safe(pos, temp, &msg->chunks) {
 		list_del_init(pos);

-- 
1.7.9.5

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: David Miller <davem@davemloft.net>
Date: 2012-11-25 21:01:42

From: Tommi Rantala <redacted>
Date: Thu, 22 Nov 2012 15:21:31 +0200

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:

...

As far as I can tell, the leak has been around since ~2003.

Signed-off-by: Tommi Rantala <redacted>

Looks good to me, Vlad please review.

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: Vlad Yasevich <hidden>
Date: 2012-11-26 14:52:45

On 11/22/2012 08:21 AM, Tommi Rantala wrote:

quoted hunk

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 <redacted>
---
  net/sctp/chunk.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7c2df9c..d241ef5 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,
  			goto errout;
  		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
  		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;

  		offset += len;

@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
  		__skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr
  			   - (__u8 *)chunk->skb->data);
  		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;

  		sctp_datamsg_assign(msg, chunk);
  		list_add_tail(&chunk->frag_list, &msg->chunks);

@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,

  	return msg;

+errout_chunk_put:
+	sctp_chunk_put(chunk);
+
  errout:
  	list_for_each_safe(pos, temp, &msg->chunks) {
  		list_del_init(pos);

Should be using sctp_chunk_free().  Good find.

-vlad

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: Neil Horman <nhorman@tuxdriver.com>
Date: 2012-11-26 15:24:13

On Thu, Nov 22, 2012 at 03:21:31PM +0200, Tommi Rantala wrote:

quoted hunk

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 <redacted>
---
 net/sctp/chunk.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7c2df9c..d241ef5 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,
 			goto errout;
 		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;
 
 		offset += len;

@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 		__skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr
 			   - (__u8 *)chunk->skb->data);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_put;
 
 		sctp_datamsg_assign(msg, chunk);
 		list_add_tail(&chunk->frag_list, &msg->chunks);

@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 	return msg;
 
+errout_chunk_put:
+	sctp_chunk_put(chunk);
+
 errout:
 	list_for_each_safe(pos, temp, &msg->chunks) {
 		list_del_init(pos);

-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

I'm fine with it the way it is, but it might be nicer if you instead just moved
the list_add_tail call up between the if (!chunk) check and the
sctp_user_addto_chunk call.  That way the unwind loop at the errout label can
just free the chunk without the need for an extra label.

Neil

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: David Miller <davem@davemloft.net>
Date: 2012-11-26 22:34:34

From: Vlad Yasevich <redacted>
Date: Mon, 26 Nov 2012 09:52:37 -0500

Should be using sctp_chunk_free().  Good find.

Tommi, please respin your patch to use sctp_chunk_free() as
Vlad has asked.

Thanks.

[PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: Tommi Rantala <hidden>
Date: 2012-11-27 14:02:55

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 <redacted>
---
 net/sctp/chunk.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7c2df9c..f2aebdb 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,
 			goto errout;
 		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_free;
 
 		offset += len;

@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 		__skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr
 			   - (__u8 *)chunk->skb->data);
 		if (err < 0)
-			goto errout;
+			goto errout_chunk_free;
 
 		sctp_datamsg_assign(msg, chunk);
 		list_add_tail(&chunk->frag_list, &msg->chunks);

@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 	return msg;
 
+errout_chunk_free:
+	sctp_chunk_free(chunk);
+
 errout:
 	list_for_each_safe(pos, temp, &msg->chunks) {
 		list_del_init(pos);

-- 
1.7.9.5

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: Vlad Yasevich <hidden>
Date: 2012-11-27 14:49:25

On 11/27/2012 09:01 AM, Tommi Rantala wrote:

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 <redacted>

Acked-by: Vlad Yasevich <redacted>

-vlad

quoted hunk

---
  net/sctp/chunk.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 7c2df9c..f2aebdb 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,
  			goto errout;
  		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
  		if (err < 0)
-			goto errout;
+			goto errout_chunk_free;

  		offset += len;

@@ -324,7 +324,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
  		__skb_pull(chunk->skb, (__u8 *)chunk->chunk_hdr
  			   - (__u8 *)chunk->skb->data);
  		if (err < 0)
-			goto errout;
+			goto errout_chunk_free;

  		sctp_datamsg_assign(msg, chunk);
  		list_add_tail(&chunk->frag_list, &msg->chunks);

@@ -332,6 +332,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,

  	return msg;

+errout_chunk_free:
+	sctp_chunk_free(chunk);
+
  errout:
  	list_for_each_safe(pos, temp, &msg->chunks) {
  		list_del_init(pos);

Re: [PATCH] sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails

From: David Miller <davem@davemloft.net>
Date: 2012-11-28 16:11:53

From: Tommi Rantala <redacted>
Date: Tue, 27 Nov 2012 16:01:46 +0200

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:

...

As far as I can tell, the leak has been around since ~2003.

Signed-off-by: Tommi Rantala <redacted>

Applied.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help