linux-kernel - Re: [PATCH V3] fs/ceph:fix double unlock in handle_cap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 30 Apr 2020 15:55:49 +0800
From:   "Yan, Zheng" <ukernel@...il.com>
To:     Wu Bo <wubo40@...wei.com>
Cc:     Jeff Layton <jlayton@...nel.org>, Sage Weil <sage@...hat.com>,
        Ilya Dryomov <idryomov@...il.com>,
        ceph-devel <ceph-devel@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        liuzhiqiang26@...wei.com, linfeilong@...wei.com
Subject: Re: [PATCH V3] fs/ceph:fix double unlock in handle_cap_export()

On Thu, Apr 30, 2020 at 2:13 PM Wu Bo <wubo40@...wei.com> wrote:
>
> If the ceph_mdsc_open_export_target_session() return fails,
> we should add mutex_lock(&session->s_mutex) on IS_ERR(tsession) block
> to avoid twice unlocking. because the session->s_mutex will be unlock
> at the out_unlock lable.
>
> --
> v2 -> v3:
>   - Rewrite solution, adding a mutex_lock(&session->s_mutex)
>     to the IS_ERR(tsession) block.
>   - Modify the comment more clearly.
> v1 -> v2:
>   - add spin_lock(&ci->i_ceph_lock) before goto out_unlock lable
>
>
> Signed-off-by: Wu Bo <wubo40@...wei.com>
> ---
>  fs/ceph/caps.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
> index 185db76..d27d778 100644
> --- a/fs/ceph/caps.c
> +++ b/fs/ceph/caps.c
> @@ -3746,6 +3746,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,
>                 WARN_ON(1);
>                 tsession = NULL;
>                 target = -1;
> +               mutex_lock(&session->s_mutex);
>         }
>         goto retry;
>
> --
> 1.8.3.1
>

 Reviewed-by: "Yan, Zheng" <zyan@...hat.com>