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;
Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley
        Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United
        Kingdom.
        Registered in England and Wales under Company Registration No. 3798903
From:   David Howells <dhowells@redhat.com>
In-Reply-To: <CAB9dFdsSHwVo6j=+z=4yiTRSJiOeKpFB4QHf6fqrLRuuAa3+JQ@mail.gmail.com>
References: <CAB9dFdsSHwVo6j=+z=4yiTRSJiOeKpFB4QHf6fqrLRuuAa3+JQ@mail.gmail.com> <165911277121.3745403.18238096564862303683.stgit@warthog.procyon.org.uk> <165911278430.3745403.16526310736054780645.stgit@warthog.procyon.org.uk>
To:     Marc Dionne <marc.dionne@auristor.com>
Cc:     dhowells@redhat.com, linux-afs@lists.infradead.org,
        linux-fsdevel@vger.kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] afs: Fix access after dec in put functions
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3733971.1659460456.1@warthog.procyon.org.uk>
Content-Transfer-Encoding: quoted-printable
Date:   Tue, 02 Aug 2022 18:14:16 +0100
Message-ID: <3733972.1659460456@warthog.procyon.org.uk>
Precedence: bulk

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 *s=
erver, 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 =3D server->debug_id;
 	bool zero;
 	int r;
 =

@@ -408,7 +408,7 @@ void afs_put_server(struct afs_net *net, struct afs_se=
rver *server,
 =

 	a =3D atomic_inc_return(&server->active);
 	zero =3D __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);
 }