From nobody Thu Apr 2 19:00:24 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 29AC533BBD0 for ; Fri, 27 Mar 2026 02:53:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774579991; cv=none; b=Vb7nn8cgtSplK1IDSC3wSUexmKpcudTwYEYYwQOEwbvLr3Dm4bEDD447U4wMgMvStYDGyj752pnr/wUf9TmpAsaxNFFpNgc3yQ263RdBOEBBcQsUfG+P2SVk0i/J5i6BpKVqna/lxeNmYMHwSzShvI6nO8OF5JI5WJ6Ih2nptNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774579991; c=relaxed/simple; bh=xl8Yjtsmf/LOTxnNIp5Gj1vMxE/NDSq35Ka1d1Gh+I0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y4Bko8KDSUAvCMk6vhlQ9vTWOFZ1mm+/1WBrTY5hL4sx3NWLcc4IxZgZiP8N1Ch1iO4bFnTlbhz/HxCG6Xs2d2gzoIgLql+ey43uiX1ZdaqFXmuIILLj/2gQ86kjTxmql1yHSl2VX4iy4UDaJofj1ByUUxBukZTaccK8iAO2cBQ= 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=LGIAmWgH; arc=none smtp.client-ip=209.85.216.50 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="LGIAmWgH" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-35a1f549e7eso1024762a91.0 for ; Thu, 26 Mar 2026 19:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774579989; x=1775184789; 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=avGTCAkGqpe176u6UmBj7ABXLWeOPjmdqkyMCsgMSh8=; b=LGIAmWgHjtsAxMBSqrbcFtDbM7p0UpTmqm/tH+KSjxPlYD9oO/C7KXpOgluGALzcsn 2x0A6bLnfrx+XfT0IWbjDTvu2qKX3m4qzDhrmwTLPAUMJxU1PAXhFrTT9kwK2kL8WWDg BM055defpqZXq77aoHXyWZ5l13e0cHXvutmMOY/DodFGBP7Ry+/4SBYVhsk2I+gbaRNb 02AJYf3r/t6VMDbVKstfgm4jBpVbNF2FYIMG9niFimKpBw9rfsvdpLT9XTzuUP6m5wIR S6nf51drSgJl6Tj37E0dJGtOOpNX2UyZsM3xa2iFL18npJGoMvFvsxgqAPzVveQU32H9 ebsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774579989; x=1775184789; 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=avGTCAkGqpe176u6UmBj7ABXLWeOPjmdqkyMCsgMSh8=; b=NELRdwBJnQX7EHIsKZLLYr81BRmZULwVVCZHc8OnzLA+oSSNlOiVlgjn/aJXUq/rkX oA2gqMKS1d5JIQbmIY0n84IbvhIT5FaWzcYyfF5xIgb3MGZP1rZpo0X0a7oM3taIOS7+ It2BaznoD50EU9B0sGkhwsqNvIkFL9FaXfPm+egQGZWwJ1b20fCoXPCok/EkONFs7nQ0 i1o+VVjJKRX1ube/uFazyQM/ak7aMaBZxQFD4WTCA5v+JVGi9/Mn7mUb3jIfvaSvucnK YTuiWNpaQaVSyYqjzlNUHCbK2Ml/lI67qurGHLpf9i4YONCl0OQWMwIxn3soNGULPXtV jjjQ== X-Forwarded-Encrypted: i=1; AJvYcCUTRd3d/MI3vy/yKPhrBp2KMESFs/IphmpnNvyI5poC6VZZZVpEHItiJUukXibZaiEmRkmwX1H/PYKj/8M=@vger.kernel.org X-Gm-Message-State: AOJu0Yxr/Irsh3eFR5J6v5MlAC97G1XLvkNviT2/XBS2z/iPgFNtpaqn T41U+/8nlXU5yDCeBTGjnnNqjikPvz9Zk79Z6DYOp6t8++uriOMWUbHK X-Gm-Gg: ATEYQzwn6vDzaZ4tfrdzINB2Qd/qotvXXMli2f1LVe/T88RqwBLYNHzHlb/lm3bp04q IdODWQConx50JeFJRdHnQDQPN5tnCO00RiYs6BvrhEHnLhOZ+081wKhOAgDf6ped5lHOElTaD0m U6JMEYWMm6M4DtYkEi3buov6DzcMdtS68PgCWrdEKEWiw1DeAoUwf1Ps4pS33OCQHTUaS7i1C1m 0fTWR2LJTt/rNCglu5T5CGCe2+CPBE7u/F8LvL3Fl6/5bWF6rJTZHf3bnUWl2AVFPCBNUw8G5/e bwOKPw9wg1Gts7JRbQ6hndgChLvZMOXCvdpNRoflrQ2kSAtcAx1Dgz6Nz+8tnR6H0h2Mc1UTOiG 6OsjbTeMv12R8znzWUMqUEm0gyDBT0ye88gOmpEr17wD2kJk+YLXtr71Jo47hn4Z3fIaQyhy2mK XCH+hiVJj5SaX+A7x6kOZldbWj3N5HTIJxJiCTWQr2eLgW7FUNMz+VPgg= X-Received: by 2002:a17:90b:2e83:b0:35b:a9f3:62ee with SMTP id 98e67ed59e1d1-35c300949fdmr953818a91.27.1774579989424; Thu, 26 Mar 2026 19:53:09 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35c22d8c26asm3644515a91.11.2026.03.26.19.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 19:53:08 -0700 (PDT) From: Rosen Penev To: nvdimm@lists.linux.dev Cc: Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] nvdimm: use struct_size for allocation Date: Thu, 26 Mar 2026 19:52:51 -0700 Message-ID: <20260327025251.7688-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" Signed-off-by: Rosen Penev --- drivers/nvdimm/region_devs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index e35c2e18518f..1350a34a34ce 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -104,7 +104,7 @@ static int nd_region_invalidate_memregion(struct nd_reg= ion *nd_region) =20 static int get_flush_data(struct nd_region *nd_region, size_t *size, int *= num_flush) { - size_t flush_data_size =3D sizeof(void *); + size_t flush_data_size =3D 0; int _num_flush =3D 0; int i; =20 @@ -117,11 +117,10 @@ static int get_flush_data(struct nd_region *nd_region= , size_t *size, int *num_fl return -EBUSY; =20 /* at least one null hint slot per-dimm for the "no-hint" case */ - flush_data_size +=3D sizeof(void *); _num_flush =3D min_not_zero(_num_flush, nvdimm->num_flush); if (!nvdimm->num_flush) continue; - flush_data_size +=3D nvdimm->num_flush * sizeof(void *); + flush_data_size +=3D nvdimm->num_flush; } =20 *size =3D flush_data_size; @@ -145,7 +144,7 @@ int nd_region_activate(struct nd_region *nd_region) if (rc) return rc; =20 - ndrd =3D devm_kzalloc(dev, sizeof(*ndrd) + flush_data_size, GFP_KERNEL); + ndrd =3D devm_kzalloc(dev, struct_size(ndrd, flush_wpq, flush_data_size),= GFP_KERNEL); if (!ndrd) return -ENOMEM; dev_set_drvdata(dev, ndrd); --=20 2.53.0