From: Joseph Qi <joseph.qi@linux.alibaba.com>
To: Dan Carpenter <dan.carpenter@oracle.com>, Mark Fasheh <mark@fasheh.com>
Cc: Jens Axboe <axboe@kernel.dk>, Takashi Iwai <tiwai@suse.de>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Shi <alex.shi@linux.alibaba.com>,
Jiri Slaby <jirislaby@kernel.org>,
ocfs2-devel@oss.oracle.com
Subject: Re: [Ocfs2-devel] [PATCH v2] ocfs2: Fix a use after free on error
Date: Tue, 2 Feb 2021 20:08:28 +0800 [thread overview]
Message-ID: <56634c6b-1c68-83dc-e372-09fd4bda3c7d@linux.alibaba.com> (raw)
In-Reply-To: <YBk4M6HUG8jB/jc7@mwanda>
On 2/2/21 7:32 PM, Dan Carpenter wrote:
> The error handling in this function frees "reg" but it is still on the
> "o2hb_all_regions" list so it will lead to a use after freew. Joseph Qi
> points out that we need to clear the bit in the "o2hb_region_bitmap" as
> well
>
> Fixes: 1cf257f51191 ("ocfs2: fix memory leak")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Looks good.
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
> v2: The first version didn't clear the bit.
>
> fs/ocfs2/cluster/heartbeat.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> index 0179a73a3fa2..12a7590601dd 100644
> --- a/fs/ocfs2/cluster/heartbeat.c
> +++ b/fs/ocfs2/cluster/heartbeat.c
> @@ -2042,7 +2042,7 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
> o2hb_nego_timeout_handler,
> reg, NULL, ®->hr_handler_list);
> if (ret)
> - goto free;
> + goto remove_item;
>
> ret = o2net_register_handler(O2HB_NEGO_APPROVE_MSG, reg->hr_key,
> sizeof(struct o2hb_nego_msg),
> @@ -2057,6 +2057,12 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
>
> unregister_handler:
> o2net_unregister_handler_list(®->hr_handler_list);
> +remove_item:
> + spin_lock(&o2hb_live_lock);
> + list_del(®->hr_all_item);
> + if (o2hb_global_heartbeat_active())
> + clear_bit(reg->hr_region_num, o2hb_region_bitmap);
> + spin_unlock(&o2hb_live_lock);
> free:
> kfree(reg);
> return ERR_PTR(ret);
>
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
prev parent reply other threads:[~2021-02-02 12:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 11:32 [Ocfs2-devel] [PATCH v2] ocfs2: Fix a use after free on error Dan Carpenter
2021-02-02 12:08 ` Joseph Qi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56634c6b-1c68-83dc-e372-09fd4bda3c7d@linux.alibaba.com \
--to=joseph.qi@linux.alibaba.com \
--cc=alex.shi@linux.alibaba.com \
--cc=axboe@kernel.dk \
--cc=dan.carpenter@oracle.com \
--cc=jirislaby@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).