From: Zhen Ni <zhen.ni@easystack.cn>
Date: Tue, 23 Sep 2025 07:51:04 +0000 (+0800)
Subject: afs: Fix potential null pointer dereference in afs_put_server
X-Git-Tag: v6.17~13^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9158c6bb245113d4966df9b2ba602197a379412e;p=thirdparty%2Fkernel%2Fstable.git

afs: Fix potential null pointer dereference in afs_put_server

afs_put_server() accessed server->debug_id before the NULL check, which
could lead to a null pointer dereference. Move the debug_id assignment,
ensuring we never dereference a NULL server pointer.

Fixes: 2757a4dc1849 ("afs: Fix access after dec in put functions")
Cc: stable@vger.kernel.org
Signed-off-by: Zhen Ni <zhen.ni@easystack.cn>
Acked-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeffrey Altman <jaltman@auristor.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/fs/afs/server.c b/fs/afs/server.c
index a97562f831eb5..c4428ebddb1da 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -331,13 +331,14 @@ struct afs_server *afs_use_server(struct afs_server *server, bool activate,
 void afs_put_server(struct afs_net *net, struct afs_server *server,
 		    enum afs_server_trace reason)
 {
-	unsigned int a, debug_id = server->debug_id;
+	unsigned int a, debug_id;
 	bool zero;
 	int r;
 
 	if (!server)
 		return;
 
+	debug_id = server->debug_id;
 	a = atomic_read(&server->active);
 	zero = __refcount_dec_and_test(&server->ref, &r);
 	trace_afs_server(debug_id, r - 1, a, reason);