Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230613030637.2934730-1-islituo@gmail.com>
In-Reply-To: <20230613030637.2934730-1-islituo@gmail.com>
From:   Andreas Gruenbacher <agruenba@redhat.com>
Date:   Tue, 13 Jun 2023 14:40:08 +0200
Message-ID: <CAHc6FU5NdUpYRhu7NR=LDLtX6CKbXvtaM6MJbkaHAZb0Y5Eh2Q@mail.gmail.com>
Subject: Re: [PATCH] gfs2: Fix possible data races in gfs2_show_options()
To:     Tuo Li <islituo@gmail.com>
Cc:     rpeterso@redhat.com, cluster-devel@redhat.com,
        linux-kernel@vger.kernel.org, baijiaju1990@outlook.com,
        BassCheck <bass@buaa.edu.cn>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, Jun 13, 2023 at 5:07=E2=80=AFAM Tuo Li <islituo@gmail.com> wrote:
> Some fields such as gt_logd_secs of the struct gfs2_tune are accessed
> without holding the lock gt_spin in gfs2_show_options():
>
>   val =3D sdp->sd_tune.gt_logd_secs;
>   if (val !=3D 30)
>     seq_printf(s, ",commit=3D%d", val);
>
> And thus can cause data races when gfs2_show_options() and other function=
s
> such as gfs2_reconfigure() are concurrently executed:
>
>   spin_lock(&gt->gt_spin);
>   gt->gt_logd_secs =3D newargs->ar_commit;
>
> To fix these possible data races, the lock sdp->sd_tune.gt_spin is
> acquired before accessing the fields of gfs2_tune and released after thes=
e
> accesses.
>
> Reported-by: BassCheck <bass@buaa.edu.cn>
> Signed-off-by: Tuo Li <islituo@gmail.com>
> ---
>  fs/gfs2/super.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
> index a84bf6444bba..671adf38fe03 100644
> --- a/fs/gfs2/super.c
> +++ b/fs/gfs2/super.c
> @@ -1059,6 +1059,7 @@ static int gfs2_show_options(struct seq_file *s, st=
ruct dentry *root)
>         }
>         if (args->ar_discard)
>                 seq_puts(s, ",discard");
> +       spin_lock(&sdp->sd_tune.gt_spin);
>         val =3D sdp->sd_tune.gt_logd_secs;
>         if (val !=3D 30)
>                 seq_printf(s, ",commit=3D%d", val);
> @@ -1070,6 +1071,7 @@ static int gfs2_show_options(struct seq_file *s, st=
ruct dentry *root)
>         val =3D sdp->sd_tune.gt_quota_quantum;
>         if (val !=3D 60)
>                 seq_printf(s, ",quota_quantum=3D%d", val);
> +       spin_unlock(&sdp->sd_tune.gt_spin);
>         if (args->ar_statfs_percent)
>                 seq_printf(s, ",statfs_percent=3D%d", args->ar_statfs_per=
cent);
>         if (args->ar_errors !=3D GFS2_ERRORS_DEFAULT) {
> --
> 2.34.1
>

Added to for-next (with minor adjustments).

Thanks,
Andreas