* [PATCH] net: rds: fix memory leak in rds_recvmsg
@ 2021-06-07 19:41 Pavel Skripkin
2021-06-08 7:11 ` Haakon Bugge
0 siblings, 1 reply; 7+ messages in thread
From: Pavel Skripkin @ 2021-06-07 19:41 UTC (permalink / raw)
To: santosh.shilimkar, davem, kuba
Cc: netdev, linux-rdma, rds-devel, linux-kernel, Pavel Skripkin,
syzbot+5134cdf021c4ed5aaa5f
Syzbot reported memory leak in rds. The problem
was in unputted refcount in case of error.
int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
int msg_flags)
{
...
if (!rds_next_incoming(rs, &inc)) {
...
}
After this "if" inc refcount incremented and
if (rds_cmsg_recv(inc, msg, rs)) {
ret = -EFAULT;
goto out;
}
...
out:
return ret;
}
in case of rds_cmsg_recv() fail the refcount won't be
decremented. And it's easy to see from ftrace log, that
rds_inc_addref() don't have rds_inc_put() pair in
rds_recvmsg() after rds_cmsg_recv()
1) | rds_recvmsg() {
1) 3.721 us | rds_inc_addref();
1) 3.853 us | rds_message_inc_copy_to_user();
1) + 10.395 us | rds_cmsg_recv();
1) + 34.260 us | }
Fixes: bdbe6fbc6a2f ("RDS: recv.c")
Reported-and-tested-by: syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---
net/rds/recv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 4db109fb6ec2..3fa16c339bfe 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -714,7 +714,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
if (rds_cmsg_recv(inc, msg, rs)) {
ret = -EFAULT;
- goto out;
+ goto out_put;
}
rds_recvmsg_zcookie(rs, msg);
@@ -740,6 +740,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
break;
}
+out_put:
if (inc)
rds_inc_put(inc);
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] net: rds: fix memory leak in rds_recvmsg
2021-06-07 19:41 [PATCH] net: rds: fix memory leak in rds_recvmsg Pavel Skripkin
@ 2021-06-08 7:11 ` Haakon Bugge
2021-06-08 8:00 ` Pavel Skripkin
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
0 siblings, 2 replies; 7+ messages in thread
From: Haakon Bugge @ 2021-06-08 7:11 UTC (permalink / raw)
To: Pavel Skripkin
Cc: Santosh Shilimkar, David S. Miller, kuba, netdev,
OFED mailing list, rds-devel, linux-kernel,
syzbot+5134cdf021c4ed5aaa5f
> On 7 Jun 2021, at 21:41, Pavel Skripkin <paskripkin@gmail.com> wrote:
>
> Syzbot reported memory leak in rds. The problem
> was in unputted refcount in case of error.
>
> int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
> int msg_flags)
> {
> ...
>
> if (!rds_next_incoming(rs, &inc)) {
> ...
> }
>
> After this "if" inc refcount incremented and
>
> if (rds_cmsg_recv(inc, msg, rs)) {
> ret = -EFAULT;
> goto out;
> }
> ...
> out:
> return ret;
> }
>
> in case of rds_cmsg_recv() fail the refcount won't be
> decremented. And it's easy to see from ftrace log, that
> rds_inc_addref() don't have rds_inc_put() pair in
> rds_recvmsg() after rds_cmsg_recv()
>
> 1) | rds_recvmsg() {
> 1) 3.721 us | rds_inc_addref();
> 1) 3.853 us | rds_message_inc_copy_to_user();
> 1) + 10.395 us | rds_cmsg_recv();
> 1) + 34.260 us | }
>
> Fixes: bdbe6fbc6a2f ("RDS: recv.c")
> Reported-and-tested-by: syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Thank for your commit and analyses. One small nit below.
> ---
> net/rds/recv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/rds/recv.c b/net/rds/recv.c
> index 4db109fb6ec2..3fa16c339bfe 100644
> --- a/net/rds/recv.c
> +++ b/net/rds/recv.c
> @@ -714,7 +714,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
>
> if (rds_cmsg_recv(inc, msg, rs)) {
> ret = -EFAULT;
> - goto out;
> + goto out_put;
Would a simple "break;" do it here and no need for the next hunk?
Thxs, Håkon
> }
> rds_recvmsg_zcookie(rs, msg);
>
> @@ -740,6 +740,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
> break;
> }
>
> +out_put:
> if (inc)
> rds_inc_put(inc);
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] net: rds: fix memory leak in rds_recvmsg
2021-06-08 7:11 ` Haakon Bugge
@ 2021-06-08 8:00 ` Pavel Skripkin
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
1 sibling, 0 replies; 7+ messages in thread
From: Pavel Skripkin @ 2021-06-08 8:00 UTC (permalink / raw)
To: Haakon Bugge
Cc: Santosh Shilimkar, David S. Miller, kuba, netdev,
OFED mailing list, rds-devel, linux-kernel,
syzbot+5134cdf021c4ed5aaa5f
On Tue, 8 Jun 2021 07:11:27 +0000
Haakon Bugge <haakon.bugge@oracle.com> wrote:
>
>
> > On 7 Jun 2021, at 21:41, Pavel Skripkin <paskripkin@gmail.com>
> > wrote:
> >
> > Syzbot reported memory leak in rds. The problem
> > was in unputted refcount in case of error.
> >
> > int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t
> > size, int msg_flags)
> > {
> > ...
> >
> > if (!rds_next_incoming(rs, &inc)) {
> > ...
> > }
> >
> > After this "if" inc refcount incremented and
> >
> > if (rds_cmsg_recv(inc, msg, rs)) {
> > ret = -EFAULT;
> > goto out;
> > }
> > ...
> > out:
> > return ret;
> > }
> >
> > in case of rds_cmsg_recv() fail the refcount won't be
> > decremented. And it's easy to see from ftrace log, that
> > rds_inc_addref() don't have rds_inc_put() pair in
> > rds_recvmsg() after rds_cmsg_recv()
> >
> > 1) | rds_recvmsg() {
> > 1) 3.721 us | rds_inc_addref();
> > 1) 3.853 us | rds_message_inc_copy_to_user();
> > 1) + 10.395 us | rds_cmsg_recv();
> > 1) + 34.260 us | }
> >
> > Fixes: bdbe6fbc6a2f ("RDS: recv.c")
> > Reported-and-tested-by:
> > syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
> > Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
>
> Thank for your commit and analyses. One small nit below.
>
> > ---
> > net/rds/recv.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/rds/recv.c b/net/rds/recv.c
> > index 4db109fb6ec2..3fa16c339bfe 100644
> > --- a/net/rds/recv.c
> > +++ b/net/rds/recv.c
> > @@ -714,7 +714,7 @@ int rds_recvmsg(struct socket *sock, struct
> > msghdr *msg, size_t size,
> >
> > if (rds_cmsg_recv(inc, msg, rs)) {
> > ret = -EFAULT;
> > - goto out;
> > + goto out_put;
>
> Would a simple "break;" do it here and no need for the next hunk?
>
>
> Thxs, Håkon
>
Sure! I'll send v2 soon. Thank you for feedback :)
With regards,
Pavel Skripkin
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] net: rds: fix memory leak in rds_recvmsg
2021-06-08 7:11 ` Haakon Bugge
2021-06-08 8:00 ` Pavel Skripkin
@ 2021-06-08 8:06 ` Pavel Skripkin
2021-06-08 12:29 ` Haakon Bugge
` (2 more replies)
1 sibling, 3 replies; 7+ messages in thread
From: Pavel Skripkin @ 2021-06-08 8:06 UTC (permalink / raw)
To: santosh.shilimkar, davem, kuba
Cc: netdev, linux-rdma, rds-devel, linux-kernel, Pavel Skripkin,
syzbot+5134cdf021c4ed5aaa5f
Syzbot reported memory leak in rds. The problem
was in unputted refcount in case of error.
int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
int msg_flags)
{
...
if (!rds_next_incoming(rs, &inc)) {
...
}
After this "if" inc refcount incremented and
if (rds_cmsg_recv(inc, msg, rs)) {
ret = -EFAULT;
goto out;
}
...
out:
return ret;
}
in case of rds_cmsg_recv() fail the refcount won't be
decremented. And it's easy to see from ftrace log, that
rds_inc_addref() don't have rds_inc_put() pair in
rds_recvmsg() after rds_cmsg_recv()
1) | rds_recvmsg() {
1) 3.721 us | rds_inc_addref();
1) 3.853 us | rds_message_inc_copy_to_user();
1) + 10.395 us | rds_cmsg_recv();
1) + 34.260 us | }
Fixes: bdbe6fbc6a2f ("RDS: recv.c")
Reported-and-tested-by: syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---
Changes in v2:
Changed goto to break.
---
net/rds/recv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 4db109fb6ec2..5b426dc3634d 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -714,7 +714,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
if (rds_cmsg_recv(inc, msg, rs)) {
ret = -EFAULT;
- goto out;
+ break;
}
rds_recvmsg_zcookie(rs, msg);
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] net: rds: fix memory leak in rds_recvmsg
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
@ 2021-06-08 12:29 ` Haakon Bugge
2021-06-08 14:41 ` Santosh Shilimkar
2021-06-08 23:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 7+ messages in thread
From: Haakon Bugge @ 2021-06-08 12:29 UTC (permalink / raw)
To: Pavel Skripkin
Cc: Santosh Shilimkar, davem, kuba, netdev, OFED mailing list,
rds-devel, linux-kernel, syzbot+5134cdf021c4ed5aaa5f
> On 8 Jun 2021, at 10:06, Pavel Skripkin <paskripkin@gmail.com> wrote:
>
> Syzbot reported memory leak in rds. The problem
> was in unputted refcount in case of error.
>
> int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
> int msg_flags)
> {
> ...
>
> if (!rds_next_incoming(rs, &inc)) {
> ...
> }
>
> After this "if" inc refcount incremented and
>
> if (rds_cmsg_recv(inc, msg, rs)) {
> ret = -EFAULT;
> goto out;
> }
> ...
> out:
> return ret;
> }
>
> in case of rds_cmsg_recv() fail the refcount won't be
> decremented. And it's easy to see from ftrace log, that
> rds_inc_addref() don't have rds_inc_put() pair in
> rds_recvmsg() after rds_cmsg_recv()
>
> 1) | rds_recvmsg() {
> 1) 3.721 us | rds_inc_addref();
> 1) 3.853 us | rds_message_inc_copy_to_user();
> 1) + 10.395 us | rds_cmsg_recv();
> 1) + 34.260 us | }
>
> Fixes: bdbe6fbc6a2f ("RDS: recv.c")
> Reported-and-tested-by: syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>
Thanks for fixing this, Håkon
> ---
>
> Changes in v2:
> Changed goto to break.
>
> ---
> net/rds/recv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/rds/recv.c b/net/rds/recv.c
> index 4db109fb6ec2..5b426dc3634d 100644
> --- a/net/rds/recv.c
> +++ b/net/rds/recv.c
> @@ -714,7 +714,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
>
> if (rds_cmsg_recv(inc, msg, rs)) {
> ret = -EFAULT;
> - goto out;
> + break;
> }
> rds_recvmsg_zcookie(rs, msg);
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] net: rds: fix memory leak in rds_recvmsg
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
2021-06-08 12:29 ` Haakon Bugge
@ 2021-06-08 14:41 ` Santosh Shilimkar
2021-06-08 23:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 7+ messages in thread
From: Santosh Shilimkar @ 2021-06-08 14:41 UTC (permalink / raw)
To: Pavel Skripkin
Cc: David S. Miller, kuba, netdev, linux-rdma, rds-devel,
linux-kernel, syzbot+5134cdf021c4ed5aaa5f
On Jun 8, 2021, at 1:06 AM, Pavel Skripkin <paskripkin@gmail.com> wrote:
>
> Syzbot reported memory leak in rds. The problem
> was in unputted refcount in case of error.
>
> int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
> int msg_flags)
> {
> ...
>
> if (!rds_next_incoming(rs, &inc)) {
> ...
> }
>
> After this "if" inc refcount incremented and
>
> if (rds_cmsg_recv(inc, msg, rs)) {
> ret = -EFAULT;
> goto out;
> }
> ...
> out:
> return ret;
> }
>
> in case of rds_cmsg_recv() fail the refcount won't be
> decremented. And it's easy to see from ftrace log, that
> rds_inc_addref() don't have rds_inc_put() pair in
> rds_recvmsg() after rds_cmsg_recv()
>
> 1) | rds_recvmsg() {
> 1) 3.721 us | rds_inc_addref();
> 1) 3.853 us | rds_message_inc_copy_to_user();
> 1) + 10.395 us | rds_cmsg_recv();
> 1) + 34.260 us | }
>
> Fixes: bdbe6fbc6a2f ("RDS: recv.c")
> Reported-and-tested-by: syzbot+5134cdf021c4ed5aaa5f@syzkaller.appspotmail.com
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
> ---
>
> Changes in v2:
> Changed goto to break.
>
Looks fine by me. Thanks for the fix.
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] net: rds: fix memory leak in rds_recvmsg
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
2021-06-08 12:29 ` Haakon Bugge
2021-06-08 14:41 ` Santosh Shilimkar
@ 2021-06-08 23:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 7+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-08 23:40 UTC (permalink / raw)
To: Pavel Skripkin
Cc: santosh.shilimkar, davem, kuba, netdev, linux-rdma, rds-devel,
linux-kernel, syzbot+5134cdf021c4ed5aaa5f
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Tue, 8 Jun 2021 11:06:41 +0300 you wrote:
> Syzbot reported memory leak in rds. The problem
> was in unputted refcount in case of error.
>
> int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
> int msg_flags)
> {
> ...
>
> [...]
Here is the summary with links:
- [v2] net: rds: fix memory leak in rds_recvmsg
https://git.kernel.org/netdev/net/c/49bfcbfd989a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-06-08 23:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 19:41 [PATCH] net: rds: fix memory leak in rds_recvmsg Pavel Skripkin
2021-06-08 7:11 ` Haakon Bugge
2021-06-08 8:00 ` Pavel Skripkin
2021-06-08 8:06 ` [PATCH v2] " Pavel Skripkin
2021-06-08 12:29 ` Haakon Bugge
2021-06-08 14:41 ` Santosh Shilimkar
2021-06-08 23:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).