From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 8404880726 for ; Tue, 13 Oct 2026 11:17:28 +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 69DBGFQt012480; Tue, 13 Oct 2026 14:16:16 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69DBGFQt012480 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="dnQa2qN7" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69DBGAL3012435 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 13 Oct 2026 14:16:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69DBGAL3012435 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a17741243eso16967465e9.0 for ; Tue, 13 Oct 2026 04:16:10 -0700 (PDT) X-Gm-Message-State: AFq9FYJl3q6XbA3ZAvuQ6ZTSHPCPiWUsMcLX/3JE8l5ZIboEJQWhesSu /yNYY/qGSKna3hH7yxmTkc+19sA/egUthJ9f11adg+4YD65BXXWMj3NwbyWy9emR1SHbTe7Krxc 9bXbK9THlTepKJZMuG80HTz3278MS/NvSRIe1p4qcrU8BhhnRNWEmBA== X-Gm-Gg: AYBFou2vdWg69mKzHRRg1nX5XhTuH7LlyLldP2NUWxMM6HGk/X6BUKGjrM18ur22ZyG aLzjnOiTpykKknwcz/xz3/X1L99yieCftAz1DyNGchv8gnzidtxNDNP9ABIcHM6O00mjZZpQuNT YX7CBLeyf3sMkOR9Nil3Obq9iQtwZWJsMB7xCAEhy5iKhwpTHtnEry59ftGs5f9rdZH6lZSP2+x dgSRLUpk3mLvlR/yYDUn53lH9SElO1tVBnDAyd0kSQguTWsb9e8FGDT5xzePc/vYRBX4LKWPf5d l6VSu5EDmXCty6du1OjjleLY6XXyxUuwKdTtTxdyT/tK5/lo69lBE/V5PYTJ8L+z6+NwMVPYPaR 0nf/fA09I11LgYBmEmSxzlAmvCmo= X-Received: by 2002:a05:600c:871b:b0:4a1:a2f3:e6f7 with SMTP id 5b1f17b1804b1-4a1a2f3e8a9mr94833455e9.29.1791890170204; Tue, 13 Oct 2026 04:16:10 -0700 (PDT) X-Received: by 2002:a05:600c:871b:b0:4a1:a2f3:e6f7 with SMTP id 5b1f17b1804b1-4a1a2f3e8a9mr94832585e9.29.1791890169484; Tue, 13 Oct 2026 04:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791890169; cv=none; d=google.com; s=arc-20260327; b=lmAy5vUeEy+tTgQs9H3sv1XZKh2uCI/ggJyCL0DkqWclXSaeJKSjgVwY3yITTP6IIR Cg8wkHrRggYG2+NkKaBE4IOlNnsj1fMdzzrqi1giDTMaaevhoydL8Yeib/8ablB+rCqk 0O1Un9w+l9Kp4tUP3OI+nqsEOoZk51IVA0z/hz3vQ0NPWHpYVpCgCoA1163joF3F1LKO Xrgq8LXMzY+fflu3hRdHs1X2V0TIloW4wcqCg/4uDq+03FjQ5Vrka0jetxUGjBiFJJP6 98TwxYvu++uOWy4c74NEUFWE1W3jrGiPKVwoIpf7PCLeeP/6saVcaMz0YDACEjefDnAq yNPw== 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=zj3tjgklPs4o3v7SncaqSgxoqsdQg3l5Dni3+M2z9Vs=; fh=M+TyAUhAp4+t7uzAVeqNdLHW5eNz2FQXSv4TjrRhpCk=; b=aiRKG+XUhQvtVvN64JRO/wDTr3VJt889Qlg8JiKcJ867mXeuJA4fDQm2KIx/gmNnr/ rD22jY90T307Bhk+LaLUvcXKlXH/RDp4qcZEG1aJuU6WQ12ifjTpx8fkghUwAXUlIV89 90fGz3S61VMv3y5QrZbAaSorV5b8d6UW6xukGpmDNXnBAeP46PLqFus7fZlg7iLnIhWP vNzznYbUT1YpHLE5vXzrxQ2Gv1VzNZFS4DKqiYrRLgA+t86/PeR2HaAMZ8POs1yNT/7H nYyd0zE//Mam2zA3xvw107DdITwjA39K206I2zjAlUIFvFsyz0SIW5u7AdDaitPTL0Wg MAug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=dnQa2qN7; 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-48de0c1c95dsi4800931f8f.499.2026.10.13.04.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 04:16:09 -0700 (PDT) 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=dnQa2qN7; 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=zj3tjgklPs4o3v7SncaqSgxoqsdQg3l5Dni3+M2z9Vs=; b=dnQa2qN7SX6+ fcvwz0SEyLJC3iw1oTS2Ts7pwElLpuoP9+kOigwiuIhrBrZ+aIaBTMmdf7CycdhlTKSSTxPYhKZTu tA+4861OIlZxgq71wROd5eyYAwacYqLhYeG/A3MhtrqEck5FAXwKwiuJT1e8+stgxPDnJlp0Gg9b+ eM5tQS/yw9944qm9s0L05UMI9qJI/gj2ayVCD9IgnhxDThl8WF8b7oLOohePKky8k0g4hIcyRvhWI piK2p/PXHxu1SebsqhfJ4PgnFVVZQIN6+dVRbaCQtM3wjm18YQ5O9cd7mzHgNipykOwTkko5ChXtz gNTNQCSQPuabZ2au4oq9iA==; 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 1xGaQv-008pMQ-1o; Tue, 13 Oct 2026 13:15:59 +0200 From: Alexander Ivanov To: den@openvz.org Date: Tue, 13 Oct 2026 13:15:53 +0200 Message-ID: <20261013111604.142989-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261013111604.142989-1-alexander.ivanov@virtuozzo.com> References: <20261013111604.142989-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v6 01/12] dm-ploop: fix u32 overflow of the delta BAT byte size 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 byte size of header and BAT, (PLOOP_MAP_OFFSET + m_Size) * sizeof(map_index_t), is computed in u32 in several places. It wraps for m_Size >= 2^30 - PLOOP_MAP_OFFSET, which a delta with small clusters may legally have. Compute the size in u64 and use ploop_nr_bat_clusters() for the number of BAT clusters everywhere. Reject a header or a resize whose hb_nr exceeds PLOOP_MAX_HB_NR, which also keeps DIV_ROUND_UP(hb_nr, 8) and the bitmap size in bits from wrapping. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-ploop: ploop target driver Signed-off-by: Alexander Ivanov --- drivers/md/dm-ploop-bat.c | 23 ++++++++++++----------- drivers/md/dm-ploop-cmd.c | 19 +++++++++---------- drivers/md/dm-ploop.h | 6 ++++-- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/drivers/md/dm-ploop-bat.c b/drivers/md/dm-ploop-bat.c index a7849de8aaa6..5ddb8ffdff07 100644 --- a/drivers/md/dm-ploop-bat.c +++ b/drivers/md/dm-ploop-bat.c @@ -189,7 +189,6 @@ int ploop_setup_metadata(struct ploop *ploop, struct page *page) struct ploop_pvd_header *m_hdr = NULL; u32 bat_clusters, offset_clusters; struct dm_target *ti = ploop->ti; - unsigned long size; int ret; m_hdr = kmap(page); @@ -213,8 +212,11 @@ int ploop_setup_metadata(struct ploop *ploop, struct page *page) ploop->nr_bat_entries = le32_to_cpu(m_hdr->m_Size); /* Header and BAT-occupied clusters at start of file */ - size = (PLOOP_MAP_OFFSET + ploop->nr_bat_entries) * sizeof(map_index_t); - bat_clusters = DIV_ROUND_UP(size, CLU_SIZE(ploop)); + bat_clusters = ploop_nr_bat_clusters(ploop, ploop->nr_bat_entries); + if ((u64)bat_clusters + ploop->nr_bat_entries > PLOOP_MAX_HB_NR) { + PL_ERR("Too large BAT"); + goto out; + } /* Clusters from start of file to first data block */ offset_clusters = SEC_TO_CLU(ploop, le32_to_cpu(m_hdr->m_FirstBlockOffset)); @@ -242,7 +244,7 @@ static int ploop_delta_check_header(struct ploop *ploop, struct rb_root *md_root, u32 *delta_nr_be_ret) { - u32 bytes, delta_nr_be, offset_clusters, bat_clusters; + u32 delta_nr_be, offset_clusters, bat_clusters; struct md_page *md0 = ploop_md_first_entry(md_root); struct ploop_pvd_header *d_hdr; int ret = -EPROTO; @@ -257,8 +259,7 @@ static int ploop_delta_check_header(struct ploop *ploop, delta_nr_be = le32_to_cpu(d_hdr->m_Size); offset_clusters = SEC_TO_CLU(ploop, le32_to_cpu(d_hdr->m_FirstBlockOffset)); - bytes = (PLOOP_MAP_OFFSET + delta_nr_be) * sizeof(map_index_t); - bat_clusters = DIV_ROUND_UP(bytes, CLU_SIZE(ploop)); + bat_clusters = ploop_nr_bat_clusters(ploop, delta_nr_be); if (delta_nr_be > ploop->nr_bat_entries || bat_clusters != offset_clusters) @@ -274,13 +275,12 @@ ALLOW_ERROR_INJECTION(ploop_delta_check_header, ERRNO); static int ploop_convert_bat_entries(struct ploop *ploop, struct rb_root *md_root, u32 nr_be, u32 nr_pages, loff_t file_size) { - u32 i, end, bytes, bat_clusters, page_id, *bat_entries, max_file_clu; + u32 i, end, bat_clusters, page_id, *bat_entries, max_file_clu; struct rb_node *node; struct md_page *md; int ret = 0; - bytes = (PLOOP_MAP_OFFSET + nr_be) * sizeof(map_index_t); - bat_clusters = DIV_ROUND_UP(bytes, CLU_SIZE(ploop)); + bat_clusters = ploop_nr_bat_clusters(ploop, nr_be); max_file_clu = file_size / CLU_SIZE(ploop) - 1; page_id = 0; @@ -311,12 +311,13 @@ int ploop_read_delta_metadata(struct ploop *ploop, struct file *file, struct rb_root *md_root, u32 *delta_nr_be_ret) { struct bio_vec bvec_on_stack, *bvec = &bvec_on_stack; - u32 i, size, delta_nr_be, nr_segs; + u32 i, delta_nr_be, nr_segs; loff_t pos, file_size; struct iov_iter iter; struct rb_node *node; struct md_page *md; ssize_t len; + u64 size; int ret; ret = -ENOMEM; @@ -339,7 +340,7 @@ int ploop_read_delta_metadata(struct ploop *ploop, struct file *file, if (ret) goto out; - size = (PLOOP_MAP_OFFSET + delta_nr_be) * sizeof(map_index_t); + size = ((u64)delta_nr_be + PLOOP_MAP_OFFSET) * sizeof(map_index_t); size = ALIGN(size, PAGE_SIZE); /* file may be open as direct */ nr_segs = size / PAGE_SIZE; diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c index 5fa78e6cff9a..ab17520c2d56 100644 --- a/drivers/md/dm-ploop-cmd.c +++ b/drivers/md/dm-ploop-cmd.c @@ -386,7 +386,7 @@ ALLOW_ERROR_INJECTION(ploop_grow_relocate_cluster, ERRNO); static int ploop_grow_update_header(struct ploop *ploop, struct ploop_cmd *cmd) { - unsigned int size, first_block_off; + unsigned int first_block_off; struct ploop_pvd_header *hdr; struct ploop_index_wb *piwb; u32 nr_be, offset, clus; @@ -413,9 +413,7 @@ static int ploop_grow_update_header(struct ploop *ploop, } piwb = md->piwb; - size = (PLOOP_MAP_OFFSET + cmd->resize.nr_bat_entries); - size *= sizeof(map_index_t); - clus = DIV_ROUND_UP(size, CLU_SIZE(ploop)); + clus = ploop_nr_bat_clusters(ploop, cmd->resize.nr_bat_entries); first_block_off = CLU_TO_SEC(ploop, clus); hdr = kmap_local_page(piwb->bat_page); @@ -597,6 +595,11 @@ static int ploop_resize(struct ploop *ploop, sector_t new_sectors) } nr_bat_entries = SEC_TO_CLU(ploop, new_sectors); + nr_bat_clusters = ploop_nr_bat_clusters(ploop, nr_bat_entries); + if ((u64)nr_bat_clusters + nr_bat_entries > PLOOP_MAX_HB_NR) { + DMWARN("resize: too large size is requested"); + return -EINVAL; + } /* Memory for new md pages */ ret = ploop_prealloc_md_pages(&cmd.resize.md_pages_root, @@ -604,8 +607,6 @@ static int ploop_resize(struct ploop *ploop, sector_t new_sectors) if (ret) return ret; - size = (PLOOP_MAP_OFFSET + nr_bat_entries) * sizeof(map_index_t); - nr_bat_clusters = DIV_ROUND_UP(size, CLU_SIZE(ploop)); hb_nr = nr_bat_clusters + nr_bat_entries; size = round_up(DIV_ROUND_UP(hb_nr, 8), sizeof(unsigned long)); @@ -1010,11 +1011,9 @@ static int process_flip_upper_deltas(struct ploop *ploop) u8 level = ploop_top_level(ploop) - 1; struct rb_node *node; struct md_page *md; - u64 size; - size = (PLOOP_MAP_OFFSET + READ_ONCE(ploop->nr_bat_entries)) - * sizeof(map_index_t); - bat_clusters = DIV_ROUND_UP(size, CLU_SIZE(ploop)); + bat_clusters = ploop_nr_bat_clusters(ploop, + READ_ONCE(ploop->nr_bat_entries)); hb_nr = ploop->hb_nr; /* diff --git a/drivers/md/dm-ploop.h b/drivers/md/dm-ploop.h index 23662943d56a..5041fc8f1e13 100644 --- a/drivers/md/dm-ploop.h +++ b/drivers/md/dm-ploop.h @@ -12,6 +12,8 @@ #include #define PLOOP_MAP_OFFSET 16 +/* Keeps DIV_ROUND_UP(hb_nr, 8) and clu + PLOOP_MAP_OFFSET within u32 */ +#define PLOOP_MAX_HB_NR round_down(U32_MAX - PLOOP_MAP_OFFSET, 8) typedef u32 map_index_t; #define BAT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(map_index_t)) @@ -410,9 +412,9 @@ static inline unsigned int ploop_nr_pages_in_cluster(struct ploop *ploop) static inline unsigned int ploop_nr_bat_clusters(struct ploop *ploop, u32 nr_bat_entries) { - unsigned long size, bat_clusters; + u64 size, bat_clusters; - size = (PLOOP_MAP_OFFSET + nr_bat_entries) * sizeof(map_index_t); + size = ((u64)nr_bat_entries + PLOOP_MAP_OFFSET) * sizeof(map_index_t); bat_clusters = DIV_ROUND_UP(size, CLU_SIZE(ploop)); return bat_clusters; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel