[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <56870339-B19F-41D4-8A92-BECB2EAC5646@oracle.com>
Date: Tue, 8 Jun 2021 14:41:38 +0000
From: Santosh Shilimkar <santosh.shilimkar@...cle.com>
To: Pavel Skripkin <paskripkin@...il.com>
CC: "David S. Miller" <davem@...emloft.net>,
"kuba@...nel.org" <kuba@...nel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-rdma@...r.kernel.org" <linux-rdma@...r.kernel.org>,
"rds-devel@....oracle.com" <rds-devel@....oracle.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"syzbot+5134cdf021c4ed5aaa5f@...kaller.appspotmail.com"
<syzbot+5134cdf021c4ed5aaa5f@...kaller.appspotmail.com>
Subject: Re: [PATCH v2] net: rds: fix memory leak in rds_recvmsg
On Jun 8, 2021, at 1:06 AM, Pavel Skripkin <paskripkin@...il.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@...kaller.appspotmail.com
> Signed-off-by: Pavel Skripkin <paskripkin@...il.com>
> ---
>
> Changes in v2:
> Changed goto to break.
>
Looks fine by me. Thanks for the fix.
Acked-by: Santosh Shilimkar <santosh.shilimkar@...cle.com>
Powered by blists - more mailing lists