From nobody Thu Apr 2 18:53:27 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39E5F340A76 for ; Fri, 27 Mar 2026 02:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580349; cv=none; b=n2oL0JbH/Ta6xd31p7WF6fCre+h9gEkNDhD9yJ007etzysPGVIytGBeu5tbXlcfviQvYXY9VK8/lHSiHwaWqpw9RFCcIZ0EsXX/vndknRdqUjYx5i2/iIh0ebTkca6zRzuuxqQXkb5qPi/UVRhDYHWYXthIL4DD3RtwmgXJM+f4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580349; c=relaxed/simple; bh=NaKCyVm1WYHg1WscLfFbkDQ6k04fmBF8uk6h/mVsmHA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XoUNMUDRH6kyX+e/O6FX3q1owB6ymRUqLm3Uu3Kwr4BTFr/q/pr6a242Ro7Q6lTXIqWr1iIIYQavI9ELmWo/qWnVd3wPsaNNvcmI5m7GnYXVyXutvrobR4E/djwWKIT2YScmpO58o0uR2OUF6Tkj334cfozvMKREEIxXp4FHb3c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=asbumraR; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="asbumraR" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-82ae378fff8so1112000b3a.2 for ; Thu, 26 Mar 2026 19:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774580347; x=1775185147; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nlhO9dnDtgKKk75FhfoMSHhoMn3ErPiErmZ+IolhpDg=; b=asbumraRodVOLML5oYt7ovjc4hBOEtAHO294uevxdUMmgbl7u61eBrVtw2+D+CKjRh coe3Lhumbeqsish+XbxkRMJ2qGK34oBHC8wwwTp5dk1B68DvRSqIV/vyLebfvL02sp1Z PsLy2oSw1xqRfOE8DWx3JeoRe91qAccRKRqJ3XcNZb9x7WFJk8pf27IfhIEyDdiv8h3c DSJNHWu+ov8YXeD5uiA6hnkHYXiK1RlM7GrLrZJBiqjrriznr9fdGvnoAmkPOb6lj4tf nnjdxg7e6vOLzoBVddO0MzryuyfAqwPYhgYAlPb5DJsWe+vrjxxsoIa7VgnZowNwqKqb gyGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774580347; x=1775185147; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nlhO9dnDtgKKk75FhfoMSHhoMn3ErPiErmZ+IolhpDg=; b=jPaUyMtQcI2qRFVaa/H6u4XdIHkGGSAWGlU2jbuoXXdyKpK4fdUfHt2MSPlURD8BNt ykKoC5qh8whO5Fn9t46F+XnbEkSq7N3TXZL2Q42EmD+uKYXEHyEQTymNxzQQXH4vswDj Ytcp5CJ95WGKf3AWIToBRU37bZn7Pfgz0AXc//rdXHZMWAC8qOq730zSaojbV7pXiFC9 1VloHe0Z4JMB7HdQw2iFGzva9KTKMGbJsBMShaFodrGXYJ7vQCherN3ZkPB6DptIAfxt 9vsjOt3M4mqWIY+mC3opE9DFziKzKLESylFTAB9fMZbQ0pAKZzyZytBnvJMdJ5DnhWG0 BLhQ== X-Forwarded-Encrypted: i=1; AJvYcCXAy6IVqMO0j2WbxKJ0EYqNCHZLPNM+oB4LwGy6HrlvRTj5ll551ouCcMr7UApUNZJLWs/S13Hp19FZDfo=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+rhoSb5nwfKIpyKmpBVobx21YTzVrTAGlG73J5Ygvl0IEaSqc B6zTHp1cql7yRVSyc5h5L7WJ0QXASGt1jcJKzA8uxc8JKSd0ZyMs8zWb X-Gm-Gg: ATEYQzyniP5mjZeXnUVxIf31erlr+bCF3wsWXifnCpa1hNRJF3zYL2aKxGGs9aeZ4wW b8BxhqpUxVrkIpgnS8jk/HWlw77INrIqdKPL/bEPQ9Gop7LRA8Zxa3EdoqcPP162xU5jVJFaWD9 oUniOVbkz6p/XBnj5rq6e5Yskqeu+CEN2FpfGqLSXJ8DRapeRlnnm1QMEsGNB8H7Yvmbl7gljTN 5whbRBT9TwJYIyGKg1XvZ8NRoRWNgn61uimtmWfJGJAh2RZ74p0+W/8qNHk1uQzTIpcDQqaalf2 eHyOLhC8OO16jft/YI1MWeF1W/2womivpa8GOM3JREmu6o/rGrpawu1TJj8cILu1cF4vshPlYOf pMZ1ig0i+7EIeRBB8U1miIfGUAA8GApI/wfHiyIhKhg0zq37pq/LTJjvs+UrNpGg7bGoR3fBu8O RL+qJNc3KGNTRM6+rz1eT1FbLZlC5rKZpl4jwmaj57fUXTDGR7LLVGEPs= X-Received: by 2002:a05:6a00:170b:b0:82c:21b8:4a1f with SMTP id d2e1a72fcca58-82c95c19881mr773878b3a.5.1774580347440; Thu, 26 Mar 2026 19:59:07 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82c7d23c7a4sm3969059b3a.27.2026.03.26.19.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 19:59:06 -0700 (PDT) From: Rosen Penev To: linux-mmc@vger.kernel.org Cc: Ulf Hansson , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH] mmc: mmc_test: use kzalloc_flex Date: Thu, 26 Mar 2026 19:58:49 -0700 Message-ID: <20260327025849.8085-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 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 Content-Type: text/plain; charset="utf-8" Simplifies allocations by using a flexible array member in these structs. Add __counted_by to get extra runtime analysis. Signed-off-by: Rosen Penev --- drivers/mmc/core/mmc_test.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index 43fdb67d5407..f5c542855037 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c @@ -51,12 +51,12 @@ struct mmc_test_pages { =20 /** * struct mmc_test_mem - allocated memory. - * @arr: array of allocations * @cnt: number of allocations + * @arr: array of allocations */ struct mmc_test_mem { - struct mmc_test_pages *arr; unsigned int cnt; + struct mmc_test_pages arr[] __counted_by(cnt); }; =20 /** @@ -135,21 +135,22 @@ struct mmc_test_dbgfs_file { * struct mmc_test_card - test information. * @card: card under test * @scratch: transfer buffer - * @buffer: transfer buffer * @highmem: buffer for highmem tests * @area: information for performance tests * @gr: pointer to results of current testcase + * @buffer: transfer buffer */ struct mmc_test_card { struct mmc_card *card; =20 u8 scratch[BUFFER_SIZE]; - u8 *buffer; #ifdef CONFIG_HIGHMEM struct page *highmem; #endif struct mmc_test_area area; struct mmc_test_general_result *gr; + + u8 buffer[]; }; =20 enum mmc_test_prep_media { @@ -315,7 +316,6 @@ static void mmc_test_free_mem(struct mmc_test_mem *mem) while (mem->cnt--) __free_pages(mem->arr[mem->cnt].page, mem->arr[mem->cnt].order); - kfree(mem->arr); kfree(mem); } =20 @@ -348,14 +348,10 @@ static struct mmc_test_mem *mmc_test_alloc_mem(unsign= ed long min_sz, if (max_segs > max_page_cnt) max_segs =3D max_page_cnt; =20 - mem =3D kzalloc_obj(*mem); + mem =3D kzalloc_flex(*mem, arr, max_segs); if (!mem) return NULL; =20 - mem->arr =3D kzalloc_objs(*mem->arr, max_segs); - if (!mem->arr) - goto out_free; - while (max_page_cnt) { struct page *page; unsigned int order; @@ -3099,7 +3095,7 @@ static ssize_t mtf_test_write(struct file *file, cons= t char __user *buf, if (ret) return ret; =20 - test =3D kzalloc_obj(*test); + test =3D kzalloc_flex(*test, buffer, BUFFER_SIZE); if (!test) return -ENOMEM; =20 @@ -3111,7 +3107,6 @@ static ssize_t mtf_test_write(struct file *file, cons= t char __user *buf, =20 test->card =3D card; =20 - test->buffer =3D kzalloc(BUFFER_SIZE, GFP_KERNEL); #ifdef CONFIG_HIGHMEM test->highmem =3D alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, BUFFER_ORDER); if (!test->highmem) { @@ -3120,17 +3115,14 @@ static ssize_t mtf_test_write(struct file *file, co= nst char __user *buf, } #endif =20 - if (test->buffer) { - mutex_lock(&mmc_test_lock); - mmc_test_run(test, testcase); - mutex_unlock(&mmc_test_lock); - } + mutex_lock(&mmc_test_lock); + mmc_test_run(test, testcase); + mutex_unlock(&mmc_test_lock); =20 #ifdef CONFIG_HIGHMEM __free_pages(test->highmem, BUFFER_ORDER); free_test_buffer: #endif - kfree(test->buffer); kfree(test); =20 return count; --=20 2.53.0