Skip to contentSkip to conversation

fix memory leak for sctp_do_bind

PATCH Superseded Mao Wenan 5 participants 19 messages Sep 10, 2019 – Sep 13, 2019

Subsystems (4)
lore
Share & tools
lore

Mao Wenan

author
#0 lore raw

cover fix memory leak for sctp_do_bind

First patch is to do cleanup, remove redundant assignment, second patch is to fix memory leak for sctp_do_bind if failed to bind address.

Mao Wenan (2):
sctp: remove redundant assignment when call sctp_get_port_local
sctp: destroy bucket if failed to bind addr

 net/sctp/socket.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/2 sctp: remove redundant assignment when call sctp_get_port_local

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sctp/socket.c +1 -2
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;
-	}
 
 	/* Refresh ephemeral port.  */
 	if (!bp->port)
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 14 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sctp/socket.c +0 -0
index 9d1f83b10c0a..766b68b55ebe 100644

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 6 lines
net/sctp/socket.c +1 -1
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Probably it should just return a bool?

regards,
dan carpenter

#3 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 10 lines · Dan Carpenter
Quoted 9 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 16 lines

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 11 lines
net/sctp/socket.c +1 -1
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

regards,
dan carpenter

author
#4 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 28 lines · Dan Carpenter
Quoted 10 lines · Dan Carpenter
Quoted 9 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 16 lines

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 11 lines
net/sctp/socket.c +1 -1
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Quoted 4 lines

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

commit 4e54064e0a13 treated non-zero return value as unexpected, so the current cleanup is ok?

Quoted 7 lines

regards,
dan carpenter

.

#5 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 31 lines · maowenan
Quoted 28 lines · Dan Carpenter
Quoted 26 lines · Dan Carpenter
Quoted 14 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sctp/socket.c +0 -0
index 9d1f83b10c0a..766b68b55ebe 100644

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 6 lines
net/sctp/socket.c +1 -1
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Quoted 7 lines
Quoted 4 lines

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

commit 4e54064e0a13 treated non-zero return value as unexpected, so the current cleanup is ok?

Yeah. It's fine, I was just confused why we weren't preserving the error code and then I saw that we didn't return errors at all and got confused.

regards,
dan carpenter

#6 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 37 lines · Dan Carpenter
Quoted 36 lines · maowenan
Quoted 32 lines · Dan Carpenter
Quoted 10 lines · Dan Carpenter
Quoted 9 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 16 lines

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 11 lines
net/sctp/socket.c +1 -1
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

Quoted 6 lines
Quoted 2 lines

commit 4e54064e0a13 treated non-zero return value as unexpected, so the current cleanup is ok?

Yeah. It's fine, I was just confused why we weren't preserving the error code and then I saw that we didn't return errors at all and got confused.

But please lets seize the moment and do the change Dean suggested. This was the last place saving this return value somewhere. It makes sense to cleanup sctp_get_port_local() now and remove that masked pointer return.

Then you may also cleanup:
socket.c: return !!sctp_get_port_local(sk, &addr);
as it will be a direct map.

Marcelo

#7 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 38 lines · Marcelo Ricardo Leitner
Quoted 37 lines · Dan Carpenter
Quoted 36 lines · maowenan
Quoted 32 lines · Dan Carpenter
Quoted 10 lines · Dan Carpenter
Quoted 9 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 16 lines

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 11 lines
net/sctp/socket.c +1 -1
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

commit 4e54064e0a13 treated non-zero return value as unexpected, so the current cleanup is ok?

Yeah. It's fine, I was just confused why we weren't preserving the error code and then I saw that we didn't return errors at all and got confused.

But please lets seize the moment and do the change Dean suggested.

*Dan*, sorry.

Quoted 10 lines

This was the last place saving this return value somewhere. It makes sense to cleanup sctp_get_port_local() now and remove that masked pointer return.

Then you may also cleanup:
socket.c: return !!sctp_get_port_local(sk, &addr);
as it will be a direct map.

Marcelo

author
#8 lore raw

Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local

Quoted 42 lines · Marcelo Ricardo Leitner
Quoted 41 lines · Marcelo Ricardo Leitner
Quoted 40 lines · Dan Carpenter
Quoted 38 lines · maowenan
Quoted 28 lines · Dan Carpenter
Quoted 10 lines · Dan Carpenter
Quoted 9 lines · Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 16 lines

net/sctp/socket.c static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) · line 403

Quoted 11 lines
net/sctp/socket.c +1 -1
index 9d1f83b10c0a..766b68b55ebe 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;

sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's not documented what it means and neither of the callers use the return since commit 62208f12451f ("net: sctp: simplify sctp_get_port").

Quoted 4 lines

Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, because before the code assumed that a pointer casted to an int was the same as a pointer casted to a long.

commit 4e54064e0a13 treated non-zero return value as unexpected, so the current cleanup is ok?

Quoted 15 lines
Quoted 5 lines
Quoted 3 lines

Yeah. It's fine, I was just confused why we weren't preserving the error code and then I saw that we didn't return errors at all and got confused.

But please lets seize the moment and do the change Dean suggested.

*Dan*, sorry.

Quoted 7 lines

This was the last place saving this return value somewhere. It makes sense to cleanup sctp_get_port_local() now and remove that masked pointer return.

Then you may also cleanup:
socket.c: return !!sctp_get_port_local(sk, &addr);
as it will be a direct map.

Thanks Marcelo, shall I post a new individual patch for cleanup as your suggest?

Quoted 6 lines
Quoted 3 lines

Marcelo

.

author
#9 lore raw

v2 cover fix memory leak for sctp_do_bind

First two patches are to do cleanup, remove redundant assignment, and change return type of sctp_get_port_local.
Third patch is to fix memory leak for sctp_do_bind if failed to bind address.

---
v2: add one patch to change return type of sctp_get_port_local.
---
Mao Wenan (3):
sctp: change return type of sctp_get_port_local
sctp: remove redundant assignment when call sctp_get_port_local
sctp: destroy bucket if failed to bind addr

 net/sctp/socket.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
Signature · 1 line
2.20.1
author
#10 lore raw

PATCH v2 1/3 sctp: change return type of sctp_get_port_local

Currently sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's neither of the callers use the return value since commit 62208f12451f ("net: sctp: simplify sctp_get_port"). Now two callers are sctp_get_port and sctp_do_bind, they actually assumend a casted to an int was the same as a pointer casted to a long, and they don't save the return value just check whether it is zero or non-zero, so it would better change return type from long to int for sctp_get_port_local.

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 net/sctp/socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/sctp/socket.c +4 -4
index 9d1f83b10c0a..5e1934c48709 100644
@@ -309,7 +309,7 @@ static int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len)
 	return retval;
 }
 
-static long sctp_get_port_local(struct sock *, union sctp_addr *);
+static int sctp_get_port_local(struct sock *, union sctp_addr *);
 
 /* Verify this is a valid sockaddr. */
 static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,
@@ -7998,7 +7998,7 @@ static void sctp_unhash(struct sock *sk)
 static struct sctp_bind_bucket *sctp_bucket_create(
 	struct sctp_bind_hashbucket *head, struct net *, unsigned short snum);
 
-static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
+static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 {
 	struct sctp_sock *sp = sctp_sk(sk);
 	bool reuse = (sk->sk_reuse || sp->reuse);
@@ -8108,7 +8108,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 
 			if (sctp_bind_addr_conflict(&ep2->base.bind_addr,
 						    addr, sp2, sp)) {
-				ret = (long)sk2;
+				ret = 1;
 				goto fail_unlock;
 			}
 		}
@@ -8180,7 +8180,7 @@ static int sctp_get_port(struct sock *sk, unsigned short snum)
 	addr.v4.sin_port = htons(snum);
 
 	/* Note: sk->sk_num gets filled in if ephemeral port request. */
-	return !!sctp_get_port_local(sk, &addr);
+	return sctp_get_port_local(sk, &addr);
 }
 
 /*
Signature · 1 line
2.20.1
maintainer Acked-by on v2 1/3
#11 lore raw

Re: [PATCH v2 net 1/3] sctp: change return type of sctp_get_port_local

Quoted 11 lines · Mao Wenan

Currently sctp_get_port_local() returns a long which is either 0,1 or a pointer casted to long. It's neither of the callers use the return value since commit 62208f12451f ("net: sctp: simplify sctp_get_port"). Now two callers are sctp_get_port and sctp_do_bind, they actually assumend a casted to an int was the same as a pointer casted to a long, and they don't save the return value just check whether it is zero or non-zero, so it would better change return type from long to int for sctp_get_port_local.

Quoted 1 line
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

This Fixes tag is not needed. It's just a cleanup. Maybe Dave can remove it for us.

Thanks.

Quoted 48 lines
---
 net/sctp/socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/sctp/socket.c +4 -4
index 9d1f83b10c0a..5e1934c48709 100644
@@ -309,7 +309,7 @@ static int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len)
 	return retval;
 }
 
-static long sctp_get_port_local(struct sock *, union sctp_addr *);
+static int sctp_get_port_local(struct sock *, union sctp_addr *);
 
 /* Verify this is a valid sockaddr. */
 static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,
@@ -7998,7 +7998,7 @@ static void sctp_unhash(struct sock *sk)
 static struct sctp_bind_bucket *sctp_bucket_create(
 	struct sctp_bind_hashbucket *head, struct net *, unsigned short snum);
 
-static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
+static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 {
 	struct sctp_sock *sp = sctp_sk(sk);
 	bool reuse = (sk->sk_reuse || sp->reuse);
@@ -8108,7 +8108,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
 
 			if (sctp_bind_addr_conflict(&ep2->base.bind_addr,
 						    addr, sp2, sp)) {
-				ret = (long)sk2;
+				ret = 1;
 				goto fail_unlock;
 			}
 		}
@@ -8180,7 +8180,7 @@ static int sctp_get_port(struct sock *sk, unsigned short snum)
 	addr.v4.sin_port = htons(snum);
 
 	/* Note: sk->sk_num gets filled in if ephemeral port request. */
-	return !!sctp_get_port_local(sk, &addr);
+	return sctp_get_port_local(sk, &addr);
 }
 
 /*
Signature · 1 line
2.20.1
author
#12 lore raw

PATCH v2 2/3 sctp: remove redundant assignment when call sctp_get_port_local

In reply to Mao Wenan

There are more parentheses in if clause when call sctp_get_port_local in sctp_do_bind, and redundant assignment to 'ret'. This patch is to do cleanup.

---
 net/sctp/socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/sctp/socket.c +1 -2
index 5e1934c48709..2f810078c91d 100644
@@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	 * detection.
 	 */
 	addr->v4.sin_port = htons(snum);
-	if ((ret = sctp_get_port_local(sk, addr))) {
+	if (sctp_get_port_local(sk, addr))
 		return -EADDRINUSE;
-	}
 
 	/* Refresh ephemeral port.  */
 	if (!bp->port)
Signature · 1 line
2.20.1
author
#14 lore raw

PATCH v2 3/3 sctp: destroy bucket if failed to bind addr

In reply to Mao Wenan

There is one memory leak bug report:

BUG: memory leak
unreferenced object 0xffff8881dc4c5ec0 (size 40):
  comm "syz-executor.0", pid 5673, jiffies 4298198457 (age 27.578s)
  hex dump (first 32 bytes):
    02 00 00 00 81 88 ff ff 00 00 00 00 00 00 00 00  ................
    f8 63 3d c1 81 88 ff ff 00 00 00 00 00 00 00 00  .c=.............
  backtrace:
    [<0000000072006339>] sctp_get_port_local+0x2a1/0xa00 [sctp]
    [<00000000c7b379ec>] sctp_do_bind+0x176/0x2c0 [sctp]
    [<000000005be274a2>] sctp_bind+0x5a/0x80 [sctp]
    [<00000000b66b4044>] inet6_bind+0x59/0xd0 [ipv6]
    [<00000000c68c7f42>] __sys_bind+0x120/0x1f0 net/socket.c:1647
    [<000000004513635b>] __do_sys_bind net/socket.c:1658 [inline]
    [<000000004513635b>] __se_sys_bind net/socket.c:1656 [inline]
    [<000000004513635b>] __x64_sys_bind+0x3e/0x50 net/socket.c:1656
    [<0000000061f2501e>] do_syscall_64+0x72/0x2e0 arch/x86/entry/common.c:296
    [<0000000003d1e05e>] entry_SYSCALL_64_after_hwframe+0x49/0xbe

This is because in sctp_do_bind, if sctp_get_port_local is to create hash bucket successfully, and sctp_add_bind_addr failed to bind address, e.g return -ENOMEM, so memory leak found, it needs to destroy allocated bucket.

---
 net/sctp/socket.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
net/sctp/socket.c +6 -4
index 2f810078c91d..69ec3b796197 100644
@@ -412,11 +412,13 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	ret = sctp_add_bind_addr(bp, addr, af->sockaddr_len,
 				 SCTP_ADDR_SRC, GFP_ATOMIC);
 
-	/* Copy back into socket for getsockname() use. */
-	if (!ret) {
-		inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
-		sp->pf->to_sk_saddr(addr, sk);
+	if (ret) {
+		sctp_put_port(sk);
+		return ret;
 	}
+	/* Copy back into socket for getsockname() use. */
+	inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
+	sp->pf->to_sk_saddr(addr, sk);
 
 	return ret;
 }
Signature · 1 line
2.20.1
maintainer Acked-by on v2 3/3
#15 lore raw

Re: [PATCH v2 net 3/3] sctp: destroy bucket if failed to bind addr

Quoted 19 lines · Mao Wenan

There is one memory leak bug report:

BUG: memory leak
unreferenced object 0xffff8881dc4c5ec0 (size 40):
  comm "syz-executor.0", pid 5673, jiffies 4298198457 (age 27.578s)
  hex dump (first 32 bytes):
    02 00 00 00 81 88 ff ff 00 00 00 00 00 00 00 00  ................
    f8 63 3d c1 81 88 ff ff 00 00 00 00 00 00 00 00  .c=.............
  backtrace:
    [<0000000072006339>] sctp_get_port_local+0x2a1/0xa00 [sctp]
    [<00000000c7b379ec>] sctp_do_bind+0x176/0x2c0 [sctp]
    [<000000005be274a2>] sctp_bind+0x5a/0x80 [sctp]
    [<00000000b66b4044>] inet6_bind+0x59/0xd0 [ipv6]
    [<00000000c68c7f42>] __sys_bind+0x120/0x1f0 net/socket.c:1647
    [<000000004513635b>] __do_sys_bind net/socket.c:1658 [inline]
    [<000000004513635b>] __se_sys_bind net/socket.c:1656 [inline]
    [<000000004513635b>] __x64_sys_bind+0x3e/0x50 net/socket.c:1656
    [<0000000061f2501e>] do_syscall_64+0x72/0x2e0 arch/x86/entry/common.c:296
    [<0000000003d1e05e>] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Quoted 8 lines

This is because in sctp_do_bind, if sctp_get_port_local is to create hash bucket successfully, and sctp_add_bind_addr failed to bind address, e.g return -ENOMEM, so memory leak found, it needs to destroy allocated bucket.

maintainer
#16 lore raw
In reply to Mao Wenan

From: Mao Wenan <[email protected]>
Date: Thu, 12 Sep 2019 12:02:16 +0800

Quoted 7 lines

First two patches are to do cleanup, remove redundant assignment, and change return type of sctp_get_port_local.
Third patch is to fix memory leak for sctp_do_bind if failed to bind address.

---
v2: add one patch to change return type of sctp_get_port_local.

Series applied with Fixes: tag removed from patch #1.

Thanks.

author
#17 lore raw

PATCH 2/2 sctp: destroy bucket if failed to bind addr

In reply to Mao Wenan

There is one memory leak bug report:

BUG: memory leak
unreferenced object 0xffff8881dc4c5ec0 (size 40):
  comm "syz-executor.0", pid 5673, jiffies 4298198457 (age 27.578s)
  hex dump (first 32 bytes):
    02 00 00 00 81 88 ff ff 00 00 00 00 00 00 00 00  ................
    f8 63 3d c1 81 88 ff ff 00 00 00 00 00 00 00 00  .c=.............
  backtrace:
    [<0000000072006339>] sctp_get_port_local+0x2a1/0xa00 [sctp]
    [<00000000c7b379ec>] sctp_do_bind+0x176/0x2c0 [sctp]
    [<000000005be274a2>] sctp_bind+0x5a/0x80 [sctp]
    [<00000000b66b4044>] inet6_bind+0x59/0xd0 [ipv6]
    [<00000000c68c7f42>] __sys_bind+0x120/0x1f0 net/socket.c:1647
    [<000000004513635b>] __do_sys_bind net/socket.c:1658 [inline]
    [<000000004513635b>] __se_sys_bind net/socket.c:1656 [inline]
    [<000000004513635b>] __x64_sys_bind+0x3e/0x50 net/socket.c:1656
    [<0000000061f2501e>] do_syscall_64+0x72/0x2e0 arch/x86/entry/common.c:296
    [<0000000003d1e05e>] entry_SYSCALL_64_after_hwframe+0x49/0xbe

This is because in sctp_do_bind, if sctp_get_port_local is to create hash bucket successfully, and sctp_add_bind_addr failed to bind address, e.g return -ENOMEM, so memory leak found, it needs to destroy allocated bucket.

---
 net/sctp/socket.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
net/sctp/socket.c +6 -4
index 766b68b55ebe..ab37fc1f7bb6 100644
@@ -412,11 +412,13 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 	ret = sctp_add_bind_addr(bp, addr, af->sockaddr_len,
 				 SCTP_ADDR_SRC, GFP_ATOMIC);
 
-	/* Copy back into socket for getsockname() use. */
-	if (!ret) {
-		inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
-		sp->pf->to_sk_saddr(addr, sk);
+	if (ret) {
+		sctp_put_port(sk);
+		return ret;
 	}
+	/* Copy back into socket for getsockname() use. */
+	inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
+	sp->pf->to_sk_saddr(addr, sk);
 
 	return ret;
 }
Signature · 1 line
2.20.1
Acked-by on the v1 series
#18 lore raw
In reply to Mao Wenan
Quoted 4 lines · Mao Wenan

First patch is to do cleanup, remove redundant assignment, second patch is to fix memory leak for sctp_do_bind if failed to bind address.

Quoted 11 lines

Mao Wenan (2):
sctp: remove redundant assignment when call sctp_get_port_local
sctp: destroy bucket if failed to bind addr

 net/sctp/socket.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1

Series