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: <165911277121.3745403.18238096564862303683.stgit@warthog.procyon.org.uk>
 <165911278430.3745403.16526310736054780645.stgit@warthog.procyon.org.uk>
 <CAB9dFdsSHwVo6j=+z=4yiTRSJiOeKpFB4QHf6fqrLRuuAa3+JQ@mail.gmail.com> <3733972.1659460456@warthog.procyon.org.uk>
In-Reply-To: <3733972.1659460456@warthog.procyon.org.uk>
From:   Marc Dionne <marc.dionne@auristor.com>
Date:   Tue, 2 Aug 2022 14:27:20 -0300
Message-ID: <CAB9dFdu2WpTf47V1HvvcU7Yhtfy4+-niQrEx1GQ2ptD5T+dmWg@mail.gmail.com>
Subject: Re: [PATCH 2/2] afs: Fix access after dec in put functions
To:     David Howells <dhowells@redhat.com>
Cc:     linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Aug 2, 2022 at 2:15 PM David Howells <dhowells@redhat.com> wrote:
>
> Marc Dionne <marc.dionne@auristor.com> wrote:
>
> > > -       trace_afs_server(server, r - 1, atomic_read(&server->active), reason);
> > > +       trace_afs_server(server->debug_id, r - 1, a, reason);
> >
> > Don't you also want to copy server->debug_id into a local variable here?
>
> Okay, how about the attached change?
>
> David
> ---
> diff --git a/fs/afs/server.c b/fs/afs/server.c
> index bca4b4c55c14..4981baf97835 100644
> --- a/fs/afs/server.c
> +++ b/fs/afs/server.c
> @@ -399,7 +399,7 @@ struct afs_server *afs_use_server(struct afs_server *server, enum afs_server_tra
>  void afs_put_server(struct afs_net *net, struct afs_server *server,
>                     enum afs_server_trace reason)
>  {
> -       unsigned int a;
> +       unsigned int a, debug_id = server->debug_id;
>         bool zero;
>         int r;
>
> @@ -408,7 +408,7 @@ void afs_put_server(struct afs_net *net, struct afs_server *server,
>
>         a = atomic_inc_return(&server->active);
>         zero = __refcount_dec_and_test(&server->ref, &r);
> -       trace_afs_server(server->debug_id, r - 1, a, reason);
> +       trace_afs_server(debug_id, r - 1, a, reason);
>         if (unlikely(zero))
>                 __afs_put_server(net, server);
>  }

Looks fine with that change.

Marc