From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 75ECE803BB for ; Tue, 17 Nov 2026 17:19:22 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHHI9wM011139; Tue, 17 Nov 2026 20:18:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHHI9wM011139 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="bOIS2V4T" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHHHofk011074 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 20:17:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHHHofk011074 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4915ba023d4so8914f8f.0 for ; Tue, 17 Nov 2026 09:17:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErElZd89J8//Tb5xXri9TPurWch3kX5ZVXtA6W9J3KoZxKm1TTO3GjlnPAk4KlHLO4+n/4sUug==@openvz.org X-Gm-Message-State: APuU4Z/5qNdk7XrBi5j26yz2FGepi4fIetld4zgGQA2N83ZIm7y8wvZg Ky8VvyJY6XtPHBn599OK+uzcL7dd3lfcxccGZxeiFx5VG9oWomdIpuqa7hAbWR4JGc4QgJ1py+Q tBaJYuNbAjA16tTlsTIK+6q/lBKTTlQ8sFaPyg1b2Qm7lqjz2ViPZtw== X-Gm-Gg: AZFdTZcecTSygIhYJYtT3x+C1h6bxr7VbOniWnPv+xJRms6ALwIkrNuROMzM+e2jDxx 0GmyaPhEj6YTldry/LyMjaKJ2Nl1AbLatyuKSjpehTfmrBKwTOiUNYztzlTGK0Swbci8ye378LI nZS5h8leQYZckUA2V1SpyKoa5Bq13atW71u1pNzh4vbfWx2vyRkDeXrS6BdMe06Ya0ZX9bE5Coq 25Q9qxQ9g+BrPPKd2n0XV1At3OmEoBAbHkIwC3/coP4RtLBZEDuXEhE7gdbpXpao/rJNqUzdpck Fs4jAok7oCz2dRv4Uzc7Rxrv/Ir4fM/bxVBgEpi38jVH8sRQHZHuRurj53WC3sECFW2ONJlm+Td w8pQLElCHhciXwv2RvzPMVlaU8qbb X-Received: by 2002:a05:6000:4310:b0:493:32cf:ff9a with SMTP id ffacd0b85a97d-4a63fdfbefcmr137244f8f.56.1794935870336; Tue, 17 Nov 2026 09:17:50 -0800 (PST) X-Received: by 2002:a05:6000:4310:b0:493:32cf:ff9a with SMTP id ffacd0b85a97d-4a63fdfbefcmr137182f8f.56.1794935869865; Tue, 17 Nov 2026 09:17:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794935869; cv=none; d=google.com; s=arc-20260327; b=C2DwT+T3yIBKcCXjZRF8st26ZkFdOBei7tas3u03KjL3yESyo6erRyV97aTFiPjuIs 47zJttpDsecmE0bsCfPiwLYP09WpnH7W9auajp8F04B8wNFCu7wQQiRVUbsQbIfYvwfY +wPOuFZ2itHwR7aYBdwh6NVjeUEFIYoUPVKHwojlwJfPENIQcBx/4nVF4LslaOudIUqj BDJdmaPKUDKmgVOd+BlEHg738qi/iCADlU2Zeg6UYfUqUtgxRNReiQ0mS27GFr6wlxel dKY5a5KjJEFRpvF4Pjq0JCiInU8UVWlrgWuR+A7EqXKnNIYiXxPFNxTCjdT72nvUTlmx fgrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=V0eMkrDFMxfHbNn471M1MYmPd32MYsgkH71b9DQYqCg=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=sR2rYuoA5ssVDHgtRy3RikgQGwrMWmdlemz/opBLJ577Z3QTY6C0Tg7WyVACn57CI0 1oUZvAUkrsqpHtuelq1duQTOzx+I2drf9mnAsxX3IqZo7C4MH9GXSjF21WAWIALrIjIX 0w1mdBCB2a9pmfE6qJJu5UXT8zxCUAP7tuipGYUmjV/UCdJW8nW/JyqEpcXrhUOgRRTG Nb0AO8iM5FTIOkBSyD1dr9Q4zQvQgoENobqpiPAKhNoVB2/MZVMTU7avefdQB6yeTAMy Hz3XzqMFg2yIibKj7kWYca/nHpmklzZKvLYGhtFNsOnZOojpeLyOU/4lLzDTShAC/91u 71uQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=bOIS2V4T; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-4a4144202c5si5789861f8f.109.2026.11.17.09.17.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 09:17:49 -0800 (PST) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=bOIS2V4T; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=V0eMkrDFMxfHbNn471M1MYmPd32MYsgkH71b9DQYqCg=; b=bOIS2V4TlGpu O34oSJHkd4XKq4YqGVUJQtILUDvtpohNo7DO08AO1KAkJWgAdl4BPiW5p97WeoN1pxNnio3ilhDZ8 fIIobjlZ6xwRFnrOSwAf/D525XiAqLLBctHBqrPa5m0EWKa6k8MhtpTIaAEWHRbSpUZzpaqK0Cudy tMzACd8bGw+HzOkz/oBRCUW09hQq+PVL77JJrDkdcgA/fqr+hWnOS5DoYktU1f2+4xdzyj0lII81p Aqrm4aG8R1kFuM8ppHh1jZEZAUb+lMDlxaxYvxIka30rIDtoeTJ7IBlnNIJY7v28IVWrSLV3aLAs8 q3PP7Q8FhWrfrT2j+1ILYQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xTMkG-00HOVM-2g; Tue, 17 Nov 2026 18:17:39 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 17 Nov 2026 18:17:40 +0100 Message-ID: <20261117171743.3216794-8-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117171743.3216794-1-alexander.ivanov@virtuozzo.com> References: <20261117171743.3216794-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v7 07/10] dm-ploop: fix use-after-free on the last inflight_md decrement X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The last piwb reference is often dropped from the BAT write completion in aio context. ploop_bat_write_finish() completes the data pios there, and once the last original request is done, suspend can finish and a table reload or remove can free the ploop in ploop_destroy(). The completing CPU still decrements inflight_md, calls wake_up() on inflight_md_wq and frees the piwb into ploop->pio_pool, so it can lock a freed waitqueue or free into a destroyed mempool. Nothing on the suspend or destroy path waits for inflight_md, and the one waiter that exists, ploop_suspend_submitting_pios(), checks the counter without a lock. It can see zero and return before wake_up() and ploop_free_piwb() are done with the ploop, so the message can finish and the table can be destroyed under the waker. Free the piwb first, then decrement inflight_md and wake the waiters under inflight_md_wq.lock as the last access to the ploop. Have the waiters take the same lock once they see zero, so they cannot proceed until the waker has released it, and wait for it in ploop_destroy() before freeing anything. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-ploop: ploop target driver Signed-off-by: Alexander Ivanov --- drivers/md/dm-ploop-cmd.c | 6 ++++-- drivers/md/dm-ploop-map.c | 22 ++++++++++++++++++---- drivers/md/dm-ploop-target.c | 7 +++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c index 2d1fa449b052..fedf13969036 100644 --- a/drivers/md/dm-ploop-cmd.c +++ b/drivers/md/dm-ploop-cmd.c @@ -157,8 +157,10 @@ static int ploop_suspend_submitting_pios(struct ploop *ploop) if (ret) goto out; - ret = wait_event_interruptible(ploop->inflight_md_wq, - !atomic_read(&ploop->inflight_md)); + spin_lock_irq(&ploop->inflight_md_wq.lock); + ret = wait_event_interruptible_locked_irq(ploop->inflight_md_wq, + !atomic_read(&ploop->inflight_md)); + spin_unlock_irq(&ploop->inflight_md_wq.lock); if (ret) goto out; diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c index ccecc90aa2ca..442537340b51 100644 --- a/drivers/md/dm-ploop-map.c +++ b/drivers/md/dm-ploop-map.c @@ -924,9 +924,25 @@ static void ploop_free_piwb(struct ploop_index_wb *piwb) static void ploop_bat_write_finish(struct pio *pio, void *piwb_ptr, blk_status_t bi_status); +/* + * Waiters do not act on zero inflight_md without holding inflight_md_wq.lock, + * so the ploop stays valid while we hold it. Once we drop it, the ploop may + * be freed, so this must be the last access to it. + */ +static void ploop_dec_inflight_md(struct ploop *ploop) +{ + unsigned long flags; + + spin_lock_irqsave(&ploop->inflight_md_wq.lock, flags); + if (atomic_dec_and_test(&ploop->inflight_md)) + wake_up_locked(&ploop->inflight_md_wq); + spin_unlock_irqrestore(&ploop->inflight_md_wq.lock, flags); +} + static void ploop_put_piwb(struct ploop_index_wb *piwb) { if (atomic_dec_and_test(&piwb->count)) { + struct ploop *ploop = piwb->ploop; ploop_bat_write_finish(piwb->pio, piwb, piwb->bi_status); @@ -940,9 +956,8 @@ static void ploop_put_piwb(struct ploop_index_wb *piwb) * zero keeps it as is */ - if (atomic_dec_and_test(&piwb->ploop->inflight_md)) - wake_up(&piwb->ploop->inflight_md_wq); ploop_free_piwb(piwb); + ploop_dec_inflight_md(ploop); } } @@ -1113,9 +1128,8 @@ void ploop_break_bat_update(struct ploop *ploop, struct md_page *md, spin_unlock(&md->md_lock); spin_unlock_irqrestore(&ploop->bat_lock, flags); - if (atomic_dec_and_test(&ploop->inflight_md)) - wake_up(&ploop->inflight_md_wq); ploop_free_piwb(piwb); + ploop_dec_inflight_md(ploop); } static void ploop_bat_page_zero_cluster(struct ploop *ploop, diff --git a/drivers/md/dm-ploop-target.c b/drivers/md/dm-ploop-target.c index 799b9d61dcdb..3b5f37a58bb1 100644 --- a/drivers/md/dm-ploop-target.c +++ b/drivers/md/dm-ploop-target.c @@ -194,6 +194,13 @@ static void ploop_destroy(struct ploop *ploop) if (ploop->kt_allocator) kthread_stop(ploop->kt_allocator->task); + /* BAT writes may still be completing from aio context */ + wait_event(ploop->inflight_md_wq, + !atomic_read(&ploop->inflight_md)); + /* Wait for ploop_dec_inflight_md() to drop the lock */ + spin_lock_irq(&ploop->inflight_md_wq.lock); + spin_unlock_irq(&ploop->inflight_md_wq.lock); + WARN_ON(!llist_empty(&ploop->pios[PLOOP_LIST_PREPARE])); WARN_ON(!llist_empty(&ploop->llresubmit_pios)); WARN_ON(!llist_empty(&ploop->enospc_pios)); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel