diff mbox series

[06/25] bcache: Use struct_size() in kzalloc()

Message ID	20200725120039.91071-7-colyli@suse.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=mT+h=BE=vger.kernel.org=linux-block-owner@kernel.org> From: Coly Li <colyli@suse.de> To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, "Gustavo A. R. Silva" <gustavoars@kernel.org>, Coly Li <colyli@suse.de> Subject: [PATCH 06/25] bcache: Use struct_size() in kzalloc() Date: Sat, 25 Jul 2020 20:00:20 +0800 Message-Id: <20200725120039.91071-7-colyli@suse.de> In-Reply-To: <20200725120039.91071-1-colyli@suse.de> References: <20200725120039.91071-1-colyli@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk
Series	bcache patches for Linux v5.9 \| expand [00/25] bcache patches for Linux v5.9 [01/25] bcache: Fix typo in Kconfig name [02/25] bcache: allocate meta data pages as compound pages [03/25] bcache: journel: use for_each_clear_bit() to simplify the code [04/25] bcache: writeback: Remove unneeded variable i [05/25] bcache: movinggc: Use struct_size() helper in kzalloc() [06/25] bcache: Use struct_size() in kzalloc() [07/25] bcache: avoid nr_stripes overflow in bcache_device_init() [08/25] bcache: fix overflow in offset_to_stripe() [09/25] bcache: add read_super_common() to read major part of super block [10/25] bcache: add more accurate error information in read_super_common() [11/25] bcache: disassemble the big if() checks in bch_cache_set_alloc() [12/25] bcache: fix super block seq numbers comparision in register_cache_set() [13/25] bcache: increase super block version for cache device and backing device [14/25] bcache: move bucket related code into read_super_common() [15/25] bcache: struct cache_sb is only for in-memory super block now [16/25] bcache: introduce meta_bucket_pages() related helper routines [17/25] bcache: handle c->uuids properly for bucket size > 8MB [18/25] bcache: handle cache prio_buckets and disk_buckets properly for bucket size > 8MB [19/25] bcache: handle cache set verify_ondisk properly for bucket size > 8MB [20/25] bcache: handle btree node memory allocation properly for bucket size > 8MB [21/25] bcache: add bucket_size_hi into struct cache_sb_disk for large bucket [22/25] bcache: add sysfs file to display feature sets information of cache set [23/25] bcache: avoid extra memory allocation from mempool c->fill_iter [24/25] bcache: avoid extra memory consumption in struct bbio for large bucket size [25/25] bcache: fix bio_{start,end}_io_acct with proper device

Commit Message

Coly Li July 25, 2020, noon UTC

From: "Gustavo A. R. Silva" <gustavoars@kernel.org>

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

This code was detected with the help of Coccinelle and, audited and
fixed manually.

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Coly Li <colyli@suse.de>
---
 drivers/md/bcache/writeback.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
index 71801c086b82..5397a2c5d6cc 100644
--- a/drivers/md/bcache/writeback.c
+++ b/drivers/md/bcache/writeback.c
@@ -459,10 +459,8 @@  static void read_dirty(struct cached_dev *dc)
 		for (i = 0; i < nk; i++) {
 			w = keys[i];
 
-			io = kzalloc(sizeof(struct dirty_io) +
-				     sizeof(struct bio_vec) *
-				     DIV_ROUND_UP(KEY_SIZE(&w->key),
-						  PAGE_SECTORS),
+			io = kzalloc(struct_size(io, bio.bi_inline_vecs,
+						DIV_ROUND_UP(KEY_SIZE(&w->key), PAGE_SECTORS)),
 				     GFP_KERNEL);
 			if (!io)
 				goto err;