From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8EE3C83F17 for ; Thu, 10 Jul 2025 21:31:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 891E98E0001; Thu, 10 Jul 2025 17:31:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 842A58D0001; Thu, 10 Jul 2025 17:31:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 781ED8E0001; Thu, 10 Jul 2025 17:31:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6792B8D0001 for ; Thu, 10 Jul 2025 17:31:34 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DE662801B9 for ; Thu, 10 Jul 2025 21:31:33 +0000 (UTC) X-FDA: 83649651666.27.632528E Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf21.hostedemail.com (Postfix) with ESMTP id 2CC361C000D for ; Thu, 10 Jul 2025 21:31:31 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CeSK1sDO; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf21.hostedemail.com: domain of alx@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=alx@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752183092; a=rsa-sha256; cv=none; b=cP+uDw5aTqRfoVc2VrhDyoA0gysDg3DYZII4w1XIkjwZQpk8hUt6IisZp5GUZFvwKOdZD6 9YX821eOTxos3MngTkAPjeB6vOOQHnXAuQJ2UmRNpxxdvUcMI3Z4fyooodHVgXlevIeL0T rhCoHDpSdp4mT/Ev7ounkxHQg2MHhTE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CeSK1sDO; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf21.hostedemail.com: domain of alx@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=alx@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752183092; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f7V0UXpqm2+kx37h0QSk+F+9RqgBVa4RJTJIm9NL4M8=; b=sdZ05ysyZihQ9TIeAAJKUtr6PP46eBFi0cv2nfa4rpJwi/+q7Zel+I7cCfxlKComQyveBh Y4G7Akf3EfRqgHDObxz03lYQmXULeJmHDLRdGQAzn02c0CqJ/lbCIOUYd8Eqm8txqfhG+E VtMHd+SGFPGKOk16Ct/hRVfDfC6JlNQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2AD28459BE; Thu, 10 Jul 2025 21:31:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DFACC4CEF4; Thu, 10 Jul 2025 21:31:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752183091; bh=VJYVfYb5aKbK4eQQkUA5lmVUT/3A2ehIMDd21vB14NU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CeSK1sDOqEclROIugmqbQobZxBiZYdf79kQefbcHMOIrfLbYKgKXDx74hfzKBA1vG BtdznHoti6CyrMOuAXA+R4jLegAAXftBL79z8VC8CJHmBXRzZGWMaG3ycxud3fzQm3 j9WYcAqeN6MIpkDiSzrd8s73a+/yJZh6fHmOFGZvQRCfpGlDTNetJyIPotmjAEnPRS mKP5Sqn74tj7b6ae+9hYkVBLg5C0C4SF0uiNnJUFKqdWh/aZMWfEaQJOlVQ/V94nUs 6Hlowmrz2W7Tx3VmqxJZeBRhnBLI4ZGtM5oF0OhPejveemcixwGk1PycR5fRTkMOgb t8nVu0In2zF2g== Date: Thu, 10 Jul 2025 23:31:24 +0200 From: Alejandro Colomar To: linux-mm@kvack.org, linux-hardening@vger.kernel.org Cc: Alejandro Colomar , Kees Cook , Christopher Bazley , shadow <~hallyn/shadow@lists.sr.ht>, linux-kernel@vger.kernel.org, Andrew Morton , kasan-dev@googlegroups.com, Dmitry Vyukov , Alexander Potapenko , Marco Elver , Christoph Lameter , David Rientjes , Vlastimil Babka , Roman Gushchin , Harry Yoo , Andrew Clayton , Rasmus Villemoes , Michal Hocko , Linus Torvalds , Al Viro , Martin Uecker , Sam James , Andrew Pinski Subject: [RFC v5 7/7] mm: Use [v]sprintf_array() to avoid specifying the array size Message-ID: X-Mailer: git-send-email 2.50.0 References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam11 X-Rspam-User: X-Stat-Signature: oyqwfd8937ot785qc5sbe4bzoo4osws8 X-Rspamd-Queue-Id: 2CC361C000D X-HE-Tag: 1752183091-573454 X-HE-Meta: U2FsdGVkX1/JxkWhU5MZtkCH1w9ozvshdTYw2SJb8MSzc1PgRmx1tsfw9CdgGDUs2UnznEuaLaI3W8CPcZWQtkjKCroWY44YHMYlyS6x4qzQ4Mo5d/o8+NKc0ZzO0SVNvTYT5rKp4cVa0k2LNUtfQd1YVF5dDMFcrjrymrPRezDUgyj0CB5vZU9nFReSxJJnp7L0EYwCTBrKMh6liOE8MJhnsfX4O5lcyMdzVLWzQaQAwKZNzi06dV7xhKkLF/MyXAzD5h7sfL+kwjWHa/DZwcBdCYUd9YS2HTK14qF0BGiSnSdiu2+ipWYIW0dtUiumWn2jGaiMF7k+RPxRLLWdqCDegRy/tC73p1xrh3UsBF9oUQvt0UarUsgvxGNbIRvhxmNQo+JZDY5en6cyRuyTjUBNtB/4FNKmFIK6Zui1zNz4k5NgeN/fg38qb5qBBDo0atzbU38dY6Q+Xg5soWw/xxTaKJmdR5BWtRSn1/BDaXPbO/ubVuIWqatHghj5GXFsWXlsy162APAj+f9xqmns16ML5ZbleGxHWy4N9dUmlfJ1eYl4rv2pMXi4i2YcfjXQmtyUkyYpR4ToC9klzUk/P6Obm7snUAlPts8p90/AgcJSFNeq6+oZzkBk5IFmQ9ho45nHGByLRIU73rMeSRpzyuumSt/jJOw9iwpbTeAccPxiPZIGL6RRsFJs3JsRmYdyBngM7rfurNX2Xljtv9hBRDmabB8piKa1uZuRHn2px9PrSsPQ3dly8UDNY+TLMtpAgk+xJziHSUbS9lvSLGDA0nBxB1yINl/fvWCOoutGJIHEZc93O4FfUXNQfeVrG2m4rdOeWczsW/mymfN5vuuL0lGp+wInBnnfk0vZDyhip9ef8jhoJWAl8B9rpWK70jVwDfo0ku4XMyeUVeETghM0dobKnBL/8P3BDklb5GZzmSev+RHQKmqu5DOS9etuk3eOIHLqlMY4MDjvtitO1XN EPHQAH6p jSAIMZC4YKiAJcn+kIOejKt8B2VWpdlkvGjuxfUzUCXFq4W1+9CFT6TJ88q/LxJvck4iSvoWaIlLYfVaroDZeq5cPn3wMraiQwYxe90iSS73m5/aIdg8FpWBhyVKQ2pHaHv6fT0PIklRsZcRkQqpjSZ8c785Yxm4pppmB4RD2p9BcpCFrSpn49Yd1GfCHeer/DOACYIVc/KxILLoB4XO2gstgy4X+fpJOX75jwsnSAcXU3hKkjdxgMABCBZBnJQZs6dg+lv5bez2wU31HwnI9sUvg3QD9FM9Ifm49aEIkwRVzsKAObbw1zasZcm0L4V0hGQgf9Tg3Cu7OQZ7WR9PS0bd0OqDFb88TbvVExJnz6+hneFLdRMKhXmsc87pbb9v7r3k2Xy5urvhb6NwNqO9fC3usMCSBTt+4iFrvCTdeU4C7Bb4kSE357tZGZy5S3T4y2gBdZkHgIwj6KSXiIfmFVVEUQk9JBWsQN+R0SNMAFZR8kWisRLRb+5dHvARgghb0qut6rXAIfu0NnOIrPtd79KBUGAY4H0oZj2nCIdtDK109XU6N8fsmL6FxtNZspC3z4r0mrUlyqdQNnWXmuNsIA+/R3w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Cc: Rasmus Villemoes Cc: Marco Elver Cc: Michal Hocko Cc: Linus Torvalds Cc: Al Viro Signed-off-by: Alejandro Colomar --- mm/backing-dev.c | 2 +- mm/cma.c | 4 ++-- mm/cma_debug.c | 2 +- mm/hugetlb.c | 3 +-- mm/hugetlb_cgroup.c | 2 +- mm/hugetlb_cma.c | 2 +- mm/kasan/report.c | 3 +-- mm/memblock.c | 4 ++-- mm/percpu.c | 2 +- mm/shrinker_debug.c | 2 +- mm/zswap.c | 2 +- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 783904d8c5ef..c4e588135aea 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -1090,7 +1090,7 @@ int bdi_register_va(struct backing_dev_info *bdi, const char *fmt, va_list args) if (bdi->dev) /* The driver needs to use separate queues per device */ return 0; - vsnprintf(bdi->dev_name, sizeof(bdi->dev_name), fmt, args); + vsprintf_array(bdi->dev_name, fmt, args); dev = device_create(&bdi_class, NULL, MKDEV(0, 0), bdi, bdi->dev_name); if (IS_ERR(dev)) return PTR_ERR(dev); diff --git a/mm/cma.c b/mm/cma.c index c04be488b099..61d97a387670 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -237,9 +237,9 @@ static int __init cma_new_area(const char *name, phys_addr_t size, cma_area_count++; if (name) - snprintf(cma->name, CMA_MAX_NAME, "%s", name); + sprintf_array(cma->name, "%s", name); else - snprintf(cma->name, CMA_MAX_NAME, "cma%d\n", cma_area_count); + sprintf_array(cma->name, "cma%d\n", cma_area_count); cma->available_count = cma->count = size >> PAGE_SHIFT; cma->order_per_bit = order_per_bit; diff --git a/mm/cma_debug.c b/mm/cma_debug.c index fdf899532ca0..751eae9f6364 100644 --- a/mm/cma_debug.c +++ b/mm/cma_debug.c @@ -186,7 +186,7 @@ static void cma_debugfs_add_one(struct cma *cma, struct dentry *root_dentry) rangedir = debugfs_create_dir("ranges", tmp); for (r = 0; r < cma->nranges; r++) { cmr = &cma->ranges[r]; - snprintf(rdirname, sizeof(rdirname), "%d", r); + sprintf_array(rdirname, "%d", r); dir = debugfs_create_dir(rdirname, rangedir); debugfs_create_file("base_pfn", 0444, dir, &cmr->base_pfn, &cma_debugfs_fops); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6a3cf7935c14..70acc8b3cbb8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4780,8 +4780,7 @@ void __init hugetlb_add_hstate(unsigned int order) for (i = 0; i < MAX_NUMNODES; ++i) INIT_LIST_HEAD(&h->hugepage_freelists[i]); INIT_LIST_HEAD(&h->hugepage_activelist); - snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB", - huge_page_size(h)/SZ_1K); + sprintf_array(h->name, "hugepages-%lukB", huge_page_size(h)/SZ_1K); parsed_hstate = h; } diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 58e895f3899a..0953cea93759 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -822,7 +822,7 @@ hugetlb_cgroup_cfttypes_init(struct hstate *h, struct cftype *cft, for (i = 0; i < tmpl_size; cft++, tmpl++, i++) { *cft = *tmpl; /* rebuild the name */ - snprintf(cft->name, MAX_CFTYPE_NAME, "%s.%s", buf, tmpl->name); + sprintf_array(cft->name, "%s.%s", buf, tmpl->name); /* rebuild the private */ cft->private = MEMFILE_PRIVATE(idx, tmpl->private); /* rebuild the file_offset */ diff --git a/mm/hugetlb_cma.c b/mm/hugetlb_cma.c index e0f2d5c3a84c..bae82a97a43c 100644 --- a/mm/hugetlb_cma.c +++ b/mm/hugetlb_cma.c @@ -211,7 +211,7 @@ void __init hugetlb_cma_reserve(int order) size = round_up(size, PAGE_SIZE << order); - snprintf(name, sizeof(name), "hugetlb%d", nid); + sprintf_array(name, "hugetlb%d", nid); /* * Note that 'order per bit' is based on smallest size that * may be returned to CMA allocator in the case of diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 8357e1a33699..3b40225e7873 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -486,8 +486,7 @@ static void print_memory_metadata(const void *addr) char buffer[4 + (BITS_PER_LONG / 8) * 2]; char metadata[META_BYTES_PER_ROW]; - snprintf(buffer, sizeof(buffer), - (i == 0) ? ">%px: " : " %px: ", row); + sprintf_array(buffer, (i == 0) ? ">%px: " : " %px: ", row); /* * We should not pass a shadow pointer to generic diff --git a/mm/memblock.c b/mm/memblock.c index 0e9ebb8aa7fe..3eea7a177330 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2021,7 +2021,7 @@ static void __init_memblock memblock_dump(struct memblock_type *type) flags = rgn->flags; #ifdef CONFIG_NUMA if (numa_valid_node(memblock_get_region_node(rgn))) - snprintf(nid_buf, sizeof(nid_buf), " on node %d", + sprintf_array(nid_buf, " on node %d", memblock_get_region_node(rgn)); #endif pr_info(" %s[%#x]\t[%pa-%pa], %pa bytes%s flags: %#x\n", @@ -2379,7 +2379,7 @@ int reserve_mem_release_by_name(const char *name) start = phys_to_virt(map->start); end = start + map->size - 1; - snprintf(buf, sizeof(buf), "reserve_mem:%s", name); + sprintf_array(buf, "reserve_mem:%s", name); free_reserved_area(start, end, 0, buf); map->size = 0; diff --git a/mm/percpu.c b/mm/percpu.c index b35494c8ede2..a467102c2405 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -3186,7 +3186,7 @@ int __init pcpu_page_first_chunk(size_t reserved_size, pcpu_fc_cpu_to_node_fn_t int upa; int nr_g0_units; - snprintf(psize_str, sizeof(psize_str), "%luK", PAGE_SIZE >> 10); + sprintf_array(psize_str, "%luK", PAGE_SIZE >> 10); ai = pcpu_build_alloc_info(reserved_size, 0, PAGE_SIZE, NULL); if (IS_ERR(ai)) diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index 20eaee3e97f7..f529ac29557c 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -176,7 +176,7 @@ int shrinker_debugfs_add(struct shrinker *shrinker) return id; shrinker->debugfs_id = id; - snprintf(buf, sizeof(buf), "%s-%d", shrinker->name, id); + sprintf_array(buf, "%s-%d", shrinker->name, id); /* create debugfs entry */ entry = debugfs_create_dir(buf, shrinker_debugfs_root); diff --git a/mm/zswap.c b/mm/zswap.c index 204fb59da33c..e66b5c5b1ecf 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -271,7 +271,7 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) return NULL; /* unique name for each pool specifically required by zsmalloc */ - snprintf(name, 38, "zswap%x", atomic_inc_return(&zswap_pools_count)); + sprintf_array(name, "zswap%x", atomic_inc_return(&zswap_pools_count)); pool->zpool = zpool_create_pool(type, name, gfp); if (!pool->zpool) { pr_err("%s zpool not available\n", type); -- 2.50.0