From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8235547B435; Tue, 16 Jun 2026 18:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781636222; cv=none; b=cLoNNFNYHlly0RuM0MVutBhyupSF3yoFG2Lmi8wSdTPXE9voOTClQTTLnGx5Sr7ZLg8zQFqU6xv8AFQ4lbcW/nDEZLuvjZ4bie2V0tVYumLE/HZ24uXggY9eYLyC4YUhWQm1UJm9MluMDZ+Rp7IiRyZl7EnY/QshSZfLSrG5oDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781636222; c=relaxed/simple; bh=kkSexJCUaXd+Cd0yna0+p5uSkKNLWI1CQUOHjqmWXpU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h6oTdjCwsbc+t2hyQU3+otGQp0kuF421P9G1fgQs37PLcFnkEmcWgCXpyyIWZmx3VDXowLSoA44lRgoqjzF2olo1olCHF3aNGvRgPgAxFLFInHIjKEUBOtUTG2TJVZJrlECxHCZxog7NiArhxvMejLA8m1C3T4H+TW1P9l+dEYs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OMH4jZGz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OMH4jZGz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C10B1F000E9; Tue, 16 Jun 2026 18:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781636221; bh=iIm5NRtziFMlH7OuInG0AT1ZPrY6OgSFSYIS79X59Zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OMH4jZGzTdZ1Xp5yK0emRPy3MSKaVnusUyVWR+U2/p/AzUvQDNtRRSKnT0SsYvE2t FWOcwjNXn2kI00tjn/h9kWjiWjiUgJnK+hxhCGTmGGcTApLz4tb//OLUc5wOAiJxO4 2Lecu3cWvHDycc+g/bEv4Ob7OD7XqFu0FNRQ/ZwQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Yilin Zhu , Ren Wei , Christian Brauner , Jeongjun Park , Kees Cook , Liam Howlett , Lorenzo Stoakes , Serge Hallyn , Vasiliy Kulikov , Davidlohr Bueso , Oleg Nesterov , Serge Hallyn , Andrew Morton Subject: [PATCH 5.10 198/342] ipc/shm: serialize orphan cleanup with shm_nattch updates Date: Tue, 16 Jun 2026 20:28:14 +0530 Message-ID: <20260616145057.420999235@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145048.348037099@linuxfoundation.org> References: <20260616145048.348037099@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yilin Zhu commit 2e5c6f4fd4001562781e99bbfc7f1f0127187542 upstream. shm_destroy_orphaned() walks the shm idr under shm_ids(ns).rwsem, but that does not serialize all fields tested by shm_may_destroy(). In particular, shm_nattch is updated while holding shm_perm.lock, and attach paths can do that without holding the rwsem. Do not decide that an orphaned segment is unused before taking the object lock. Move the shm_may_destroy() check under shm_perm.lock, matching the other destroy paths, and unlock the segment when it no longer qualifies for removal. Link: https://lore.kernel.org/9d97cc1031de2d0bace0edf3a668818aa2f4eca6.1777410234.git.zylzyl2333@gmail.com Fixes: 4c677e2eefdb ("shm: optimize locking and ipc_namespace getting") Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Yilin Zhu Signed-off-by: Ren Wei Cc: Christian Brauner Cc: Jeongjun Park Cc: Kees Cook Cc: Liam Howlett Cc: Lorenzo Stoakes Cc: Serge Hallyn Cc: Vasiliy Kulikov Cc: Davidlohr Bueso Cc: Oleg Nesterov Cc: Serge Hallyn Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- ipc/shm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/ipc/shm.c +++ b/ipc/shm.c @@ -402,15 +402,17 @@ static int shm_try_destroy_orphaned(int * We want to destroy segments without users and with already * exit'ed originating process. * - * As shp->* are changed under rwsem, it's safe to skip shp locking. + * shm_nattch can be changed under shm_perm.lock without holding the + * rwsem, so take the object lock before checking shm_may_destroy(). */ if (!list_empty(&shp->shm_clist)) return 0; - if (shm_may_destroy(shp)) { - shm_lock_by_ptr(shp); + shm_lock_by_ptr(shp); + if (shm_may_destroy(shp)) shm_destroy(ns, shp); - } + else + shm_unlock(shp); return 0; }