From nobody Sat Sep 26 10:01:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D3F047FAED for ; Wed, 2 Sep 2026 12:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351048; cv=none; b=KUzosl6IYhWsJ11B/2mjs+ARR7NKqpwuxrd6gFpAk5VvTNFbndP1zIASBIGZrmE+y8rDPS0GYJo0n67Q/Lo4YKZ6MuNjfK/Q+JMQUiD4PJ1YhyJwcjzlemx71/QA961fWXhuBu3HkXYWmlJFzxs2l5p+3YZkmcEwfFz8HurtK7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351048; c=relaxed/simple; bh=NhQmeJ7xXtC2qhhuZdlM1pf4BctUAxpJW0Z9jOz1lXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r24xUU4bOoAq2DOZmJ3bgUIaXChJeVpTL+mBxcwUXE9HZd1z+jwfGK/1C/rNbCGeT0636Ns4CMFXNv4HsD+x9GFRdPSC9nhNoQhTY2G1kGXZkc8EaaFrT63O4RreiiWb6lbMnDT8ygmxYZZvitqIO70b5PS/rHRnne1AS1nGLdo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SJ3GNfms; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SJ3GNfms" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788351041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NQ4xYgPisX1eloJMBrUIHWw1g1geoI0YKTxulh3uSC0=; b=SJ3GNfmst8argChdJpPp4c6NpbxjEZ3F0MZ5/2SQ50O7veyqI1x0X52blzUWWOHAK+p9mF xKnZjW+eUoZOG2qIAOqeik5HPIlQL8R5LdL4jgUpWMy4IhG3+UShBBKn4BL/LCclIV7evZ MfJDgv+SnZrOHG43E1h7BY7Zo40W5zA= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-493-cGpnszrpMNaoY7iEI94stQ-1; Wed, 02 Sept 2026 08:10:38 -0400 X-MC-Unique: cGpnszrpMNaoY7iEI94stQ-1 X-Mimecast-MFC-AGG-ID: cGpnszrpMNaoY7iEI94stQ_1788351037 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 80056180217D; Wed, 2 Sep 2026 12:10:37 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.158]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70EE61955D67; Wed, 2 Sep 2026 12:10:33 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/4] afs: Fix missing kunmap in afs_dir_search_bucket() Date: Wed, 2 Sep 2026 13:10:19 +0100 Message-ID: <20260902121024.3328255-2-dhowells@redhat.com> In-Reply-To: <20260902121024.3328255-1-dhowells@redhat.com> References: <20260902121024.3328255-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" Fix afs_dir_search_bucket() to kunmap the block it's using in the "bad:" path. Fixes: a5b5beebcf96 ("afs: Use the contained hashtable to search a director= y") Closes: https://sashiko.dev/#/patchset/20260716103030.3065561-1-dhowells%40= redhat.com Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org cc: stable@vger.kernel.org --- fs/afs/dir_search.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/afs/dir_search.c b/fs/afs/dir_search.c index 104411c0692f..4977ad81fa82 100644 --- a/fs/afs/dir_search.c +++ b/fs/afs/dir_search.c @@ -173,12 +173,11 @@ int afs_dir_search_bucket(struct afs_dir_iter *iter, = const struct qstr *name, =20 ret =3D -ENOENT; found: +bad: if (iter->block) { kunmap_local(iter->block); iter->block =3D NULL; } - -bad: if (ret =3D=3D -ESTALE) afs_invalidate_dir(iter->dvnode, afs_dir_invalid_iter_stale); _leave(" =3D %d", ret); From nobody Sat Sep 26 10:01:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6725537756F for ; Wed, 2 Sep 2026 12:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351055; cv=none; b=aeaoaYREbXz/G02a6MwWaPWRMtHE5FBDHhBRFw+5aBG687PqVDjJ8fTr8cTAHRtoQkvtEu4YQCw3//rASUzonv/ejoWMx/jzcwgBpSbeDokCNEFt4AMjfa3TI6lcmliaz9VYpMKL4J1ZOpGmFYZ69yZd+CnNkvO1Ah4Mn9bhAG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351055; c=relaxed/simple; bh=AhEHvXnlqjhULJbnLscjMcsqHiQQVTqFOXFaQMY9Rrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MeC/q2i6iUn/icLGUvH76I9LnDDDkzWnbk+FEs9Oa5CJLf54U5jgUX8haATaxg47hoI6llqUxngkgb/YbAKcXm/bujNOHAbAlsuPOnmfTw4GviTgsIelVh9C7u4ItYJfjw4nbkpbuzXUlYk5gJkv6ti6ETCY6rjB6XLQgnyti9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=C9ZXj05d; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C9ZXj05d" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788351047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ao17jtkcyHXF1zZt5SJ094Pq8EcCzBFJGX1iQ8ssRM0=; b=C9ZXj05dtKkqA7eLmMlgJiVs1CZ+CPAczEG8dzcsdKd13qIi1N1h6+46J+bHEcL1ktCeur DgsavY4BXZ+AnNUnqJ2JlPRLJtDhUFG/8CN8zOuTm0L1Bg0TrKTgfdH4sUldIn3i3ZDXJe sdRTzmjSAAcwD3YzEGpOltF7aSdbkJw= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-395-ns0KasSFMmqF1CpdtDu04w-1; Wed, 02 Sept 2026 08:10:43 -0400 X-MC-Unique: ns0KasSFMmqF1CpdtDu04w-1 X-Mimecast-MFC-AGG-ID: ns0KasSFMmqF1CpdtDu04w_1788351042 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3EAEB1933E82; Wed, 2 Sep 2026 12:10:42 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.158]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70AAA1800577; Wed, 2 Sep 2026 12:10:38 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/4] afs: Fix double-unmap of directory block Date: Wed, 2 Sep 2026 13:10:20 +0100 Message-ID: <20260902121024.3328255-3-dhowells@redhat.com> In-Reply-To: <20260902121024.3328255-1-dhowells@redhat.com> References: <20260902121024.3328255-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Fix afs_edit_dir_remove() to use a cleanup function to unmap the block pointed to by afs_dir_iter::block if it's left pointing to something rather than manually kunmapping the blocks. Manually kunmapping without clearing iter.blocks can result in a double-kunmap if afs_dir_find_block() is called twice in a row (which would be the case if the block being modified is not first in the hash chain). Fixes: a5b5beebcf96 ("afs: Use the contained hashtable to search a director= y") Closes: https://sashiko.dev/#/patchset/20260716103030.3065561-1-dhowells%40= redhat.com Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org cc: stable@vger.kernel.org --- fs/afs/dir_edit.c | 9 ++------- fs/afs/dir_search.c | 10 ++-------- fs/afs/internal.h | 8 ++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index 3ead36a07048..c31303059444 100644 --- a/fs/afs/dir_edit.c +++ b/fs/afs/dir_edit.c @@ -442,7 +442,7 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, /* Check and clear the entry. */ de =3D &block->dirents[slot]; if (de->u.valid !=3D 1) - goto error_unmap; + goto error; =20 trace_afs_edit_dir(vnode, why, afs_edit_dir_delete, b, slot, ntohl(de->u.vnode), ntohl(de->u.unique), @@ -458,7 +458,6 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, /* Clear the constituent entries. */ next =3D de->u.hash_next; memset(de, 0, sizeof(*de) * iter.nr_slots); - kunmap_local(block); =20 /* Adjust the hash chain: if iter->prev_entry is 0, the hashtable head * index is previous; otherwise it's slot number of the previous entry. @@ -485,7 +484,6 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, pde =3D &pblock->dirents[ps]; prev_next =3D pde->u.hash_next; if (prev_next !=3D htons(entry)) { - kunmap_local(pblock); pr_warn("%llx:%llx:%x: not prev in chain b=3D%x p=3D%x,%x e=3D%x %*s", vnode->fid.vid, vnode->fid.vnode, vnode->fid.unique, iter.bucket, iter.prev_entry, prev_next, entry, @@ -493,7 +491,6 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, goto error; } pde->u.hash_next =3D next; - kunmap_local(pblock); } =20 netfs_single_mark_inode_dirty(&vnode->netfs.inode); @@ -503,18 +500,16 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, _debug("Remove %s from %u[%u]", name->name, b, slot); =20 out_unmap: + afs_dir_end_iter(&iter); kunmap_local(meta); _leave(""); return; =20 already_invalidated: - kunmap_local(block); trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_inval, 0, 0, 0, 0, name->name); goto out_unmap; =20 -error_unmap: - kunmap_local(block); error: trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_error, 0, 0, 0, 0, name->name); diff --git a/fs/afs/dir_search.c b/fs/afs/dir_search.c index 4977ad81fa82..11ebdfffcb1d 100644 --- a/fs/afs/dir_search.c +++ b/fs/afs/dir_search.c @@ -75,10 +75,7 @@ union afs_xdr_dir_block *afs_dir_find_block(struct afs_d= ir_iter *iter, size_t bl =20 _enter("%zx,%d", block, slot); =20 - if (iter->block) { - kunmap_local(iter->block); - iter->block =3D NULL; - } + afs_dir_end_iter(iter); =20 if (dvnode->directory_size < blend) goto fail; @@ -174,10 +171,7 @@ int afs_dir_search_bucket(struct afs_dir_iter *iter, c= onst struct qstr *name, ret =3D -ENOENT; found: bad: - if (iter->block) { - kunmap_local(iter->block); - iter->block =3D NULL; - } + afs_dir_end_iter(iter); if (ret =3D=3D -ESTALE) afs_invalidate_dir(iter->dvnode, afs_dir_invalid_iter_stale); _leave(" =3D %d", ret); diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 290873bac89b..330654ed16ec 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -1133,6 +1133,14 @@ int afs_dir_search_bucket(struct afs_dir_iter *iter,= const struct qstr *name, int afs_dir_search(struct afs_vnode *dvnode, const struct qstr *name, struct afs_fid *_fid, afs_dataversion_t *_dir_version); =20 +static inline void afs_dir_end_iter(struct afs_dir_iter *iter) +{ + if (iter->block) { + kunmap_local(iter->block); + iter->block =3D NULL; + } +} + /* * dir_silly.c */ From nobody Sat Sep 26 10:01:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA7A148CD55 for ; Wed, 2 Sep 2026 12:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351057; cv=none; b=fVyD+PZq74qk0v4/Hgjaph6YoohJHSifwB1uFhnNnccfOYgG30rCgXZFjOYqIA5V0ddf/5w6GaKujoWOw9roRTHPWQt50qEZcV/IawNgMvdTqd92+q+tVGHQEr6NJNkdA25AgSA+u4BsizqbgxUTxi6o9PG+E9vB3t+RO8UY9ZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351057; c=relaxed/simple; bh=sBl+pLkIcu58O58s03FOD2iBRo8SAQetohj3cHGNr7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gwW/e4KS9TSQtL+Mfv1O4LkzsSufhKVkUXZH0r0Wrm4+pyvcxR68tLSEDFTvZlf6x2GR7EBkZEN5haK/h2U+T49hnsF/pv0tzFuTkXAXZ6bPED2AJG+O287VhOSrsFww3UgRIm+CLAk59Y3ofztq/ItSgSnaxVOvbwVfZgI9z7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BzBwbfTV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BzBwbfTV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788351051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Plgr/hKSkLRXyY3mXsUHN2X576dkoAmpPrwo5diFJs=; b=BzBwbfTVnmcAC+ZFMK69wMj6Jnh/CHzb3vWfTPbRYBejYcwzkIi7OjFgwbKg5aFOaKnyRM LetsDSZInqDMTH8+mEOufhQFHuPTuKkoGdWywHg5w2E08UuR/vazEnkrBrN4rPrgibECEn ETpIl5sGSTg9aIMNrCGGB4X4Qzd9d4Q= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-ChXDD57XPmKblE2D58IHpg-1; Wed, 02 Sept 2026 08:10:47 -0400 X-MC-Unique: ChXDD57XPmKblE2D58IHpg-1 X-Mimecast-MFC-AGG-ID: ChXDD57XPmKblE2D58IHpg_1788351046 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93AE8180121E; Wed, 2 Sep 2026 12:10:46 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.158]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F124C1800642; Wed, 2 Sep 2026 12:10:43 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 3/4] afs: Fix incorrect free in candidate cleanup in afs_lookup_server() Date: Wed, 2 Sep 2026 13:10:21 +0100 Message-ID: <20260902121024.3328255-4-dhowells@redhat.com> In-Reply-To: <20260902121024.3328255-1-dhowells@redhat.com> References: <20260902121024.3328255-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Fix afs_lookup_server() to not free an existing server's endpoint state when cleaning up a candidate server. The candidate record doesn't have an endpoint state yet at this point, so the free for that can just be removed. Fixes: 4882ba78574e ("afs: Fix afs_server ref accounting") Link: https://sashiko.dev/#/patchset/20260729160108.2031453-1-dhowells%40re= dhat.com Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org cc: stable@vger.kernel.org --- fs/afs/server.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/afs/server.c b/fs/afs/server.c index 0fe162ea2a36..189138bd6d71 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c @@ -242,7 +242,6 @@ struct afs_server *afs_lookup_server(struct afs_cell *c= ell, struct key *key, out: afs_put_addrlist(alist, afs_alist_trace_put_server_create); if (candidate) { - kfree(rcu_access_pointer(server->endpoint_state)); kfree(candidate); afs_dec_servers_outstanding(cell->net); } From nobody Sat Sep 26 10:01:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9054747CA8A for ; Wed, 2 Sep 2026 12:11:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351068; cv=none; b=pVNR0825xFow8SLK8CrdgCR1vV/NI/PeoQA6HpwfuqZzj8Gfvl9G1B4mwFiMZPWdWoetlFVC7mUox8yrIoJ7QGhZcqykkifUVIvCGIJ2uuLsouDsFM1g8BCKAgTAMQbHrjcRcgRUCMiOq+UM2i2LP6OCPcSKEcGDN2PeI5Ol1ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351068; c=relaxed/simple; bh=YMK5LvesX9XitnPi7os9CksoixaX/8C7fM7tV9Cgc3I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rf2SyNnzkz5fB9fAVcJP0KwMK/v1+O6iply4okhKu6d20pfQVASGpzYasSwRGbdkSeFlrPAL/7Bbtk/j1Ue7nuQFvMlXUqMjI/fcmLm3Tmogfg+iROn/g05xFwQFcxbhWUI13zQEpExcyh73j7oZnT+65w8dJy2eJxSNtqXQPB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ly7LI3HW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ly7LI3HW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788351060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zanSzEiwTIQarru0lltqSRWr2TKEL/j5OJqjRgaFpJA=; b=Ly7LI3HWAzH98n29gPDb+921h+S5I9gCDQad2c7zPQL9AbULGgWH1EEMkBImK9YF0g6zY5 62/nBUftz/b46Hp/B0xF7RpCKlQUuM1rejXUDGyh0P3RpQEkYq2w8Qt3N/wC28SZ2MczXI ag3gJlLbQjfa1YL2tp8uPL1peyjYzJs= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-660-2dqzDj8YNfqSjBxsi3hNOw-1; Wed, 02 Sept 2026 08:10:57 -0400 X-MC-Unique: 2dqzDj8YNfqSjBxsi3hNOw-1 X-Mimecast-MFC-AGG-ID: 2dqzDj8YNfqSjBxsi3hNOw_1788351056 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 48E8D19344F7; Wed, 2 Sep 2026 12:10:55 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.158]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1428D3000223; Wed, 2 Sep 2026 12:10:51 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Chengfeng Ye , Qi Zhang , stable@vger.kernel.org Subject: [PATCH 4/4] afs: Clear stale peer app data after address list changes Date: Wed, 2 Sep 2026 13:10:22 +0100 Message-ID: <20260902121024.3328255-5-dhowells@redhat.com> In-Reply-To: <20260902121024.3328255-1-dhowells@redhat.com> References: <20260902121024.3328255-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" From: Chengfeng Ye afs_fs_probe_fileserver() fetches the current endpoint state under server->fs_lock, but leaves old_alist as NULL. Consequently, afs_set_peer_appdata() treats every address list replacement as initial setup and only binds the new peers; it never unbinds peers removed from the old list. An address refresh can therefore proceed as follows. CPU 0 replaces server S's list and drops Pold without clearing Pold->app_data. The server destroyer then clears only S's current peers and lets S reach its RCU callback. After the callback frees S, CPU 1 handles a callback through an RxRPC connection that still pins Pold, reads Pold->app_data, and calls afs_use_server() on the freed object. KASAN reported: BUG: KASAN: slab-use-after-free in afs_find_server+0x3c/0xa0 Read of size 4 at addr ffff8881013e1af0 by task krxrpcio/7001/74 Call Trace: afs_find_server+0x3c/0xa0 afs_rx_new_call+0x15c/0x390 rxrpc_new_incoming_call+0x97c/0x1730 rxrpc_input_packet.constprop.0+0xd03/0xec0 rxrpc_io_thread+0x967/0x1640 Allocated by task 93: afs_lookup_server+0x1a7/0x14c0 afs_alloc_server_list+0x43f/0xb60 afs_create_volume+0x923/0x1490 afs_get_tree+0x1c6/0x10a0 Freed by task 0: kfree+0x131/0x3c0 rcu_core+0x50a/0x1850 Last potentially related work creation: __call_rcu_common.constprop.0+0x71/0xa10 afs_put_server+0x213/0x2b0 Preserve old->addresses for the peer app-data update so that removed peers are cleared before the endpoint state is replaced. Also advance both cursors when the old and new lists share a peer; activating the old/new comparison without this would otherwise loop forever on the shared entry. Fixes: 40e8b52fe8c8 ("afs: Use the per-peer app data provided by rxrpc") Signed-off-by: Chengfeng Ye Signed-off-by: Qi Zhang Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org cc: stable@vger.kernel.org --- fs/afs/addr_list.c | 5 ++++- fs/afs/fs_probe.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c index 63bf096b721a..73195d76b481 100644 --- a/fs/afs/addr_list.c +++ b/fs/afs/addr_list.c @@ -394,8 +394,11 @@ void afs_set_peer_appdata(struct afs_server *server, struct rxrpc_peer *pn =3D new_alist->addrs[n].peer; struct rxrpc_peer *po =3D old_alist->addrs[o].peer; =20 - if (pn =3D=3D po) + if (pn =3D=3D po) { + n++; + o++; continue; + } if (pn < po) { rxrpc_kernel_set_peer_data(pn, data); n++; diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index a91ad1938d07..8c62334dbfe7 100644 --- a/fs/afs/fs_probe.c +++ b/fs/afs/fs_probe.c @@ -258,6 +258,7 @@ int afs_fs_probe_fileserver(struct afs_net *net, struct= afs_server *server, lockdep_is_held(&server->fs_lock)); if (old) { estate->responsive_set =3D old->responsive_set; + old_alist =3D old->addresses; if (!new_alist) new_alist =3D old->addresses; }