From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 7B1CA342CB0 for ; Sun, 10 May 2026 21:40:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778449208; cv=none; b=RjncezKC2hgE8qpZVDry41gswiAOF6c1WPl0bxfl3IDQvJfAaLUzHx7gEntY7h6G59SYkvfiFiTLzmPuQzGxXHmYWMpLaoDITmFcFtIl2tjfyuDWUIXLvWNa4MUi+QDmGaesqgpTTeOUWeTywx1I8JIzg+8DxTSpot3u6umrWps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778449208; c=relaxed/simple; bh=4cLZHwem16BUjR8d7nOw5TC1aHcH2R14O/Odk4slIw8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JVUUD/e/5NxwP7f/f+t79+/DZl0dP5MB2a/2o4VdP1z1QbTSMHGLNvVVGrOjH/KlBYGIveiRuCXQVmjAzzG7zOwXQU/0Y3v9iEkSaFsyQ41Qw+FLyWJov7SLSrdyYeMJaqfRfakW1UhQ52vK+lchGRiS8KVl/lNgCJIAXhZ2zJo= 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=U4p/HjF0; arc=none smtp.client-ip=209.85.216.42 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="U4p/HjF0" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3680540a6efso355294a91.2 for ; Sun, 10 May 2026 14:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778449207; x=1779054007; 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=u2ZQ7SHBdqE6H5rbmCDx4Mu3g9Q2Kql7m+nu70Z/vGM=; b=U4p/HjF0I0D4Z45HYovqh/RWEK3cPtpcgN719aU/1hpo5eUnvDNtSduBjhA0OEdf35 czfnTzkrINFZjQMauwodXeGz3cq0S8wWhS8xANJu2lnO5uqDIilB3oj6ttraM7h8qqj+ BR6ciyn/9/CYA1ydaXsPOjTWp77flEVAThGuxl4kQKplrEkY7lAUMx6ArQPD6AyEH6E2 etCLwJFrB85661eJ+nbeJT1hZ/neLZKkFCb/1AmBt2VAxo2Jvi4KdSUgZMzgsKGcZafF 9u/v1Eu/6jnTj6auc9Th+EnHBoDZQmbi7QXdOS9XHkytKBzTGIWlezJryC6WBOx5E1O3 xtqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778449207; x=1779054007; 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=u2ZQ7SHBdqE6H5rbmCDx4Mu3g9Q2Kql7m+nu70Z/vGM=; b=RigSOpvMkf7he4ZC06yL/iCp6WBiTNxaMJUr5x36V8n2jGnMtUbieDHHgzP8AJ527x H98qaf4WFeG6YIUXfB5WgdwAu4DTAxoO8kemMDbFeM2grpoAgsuES9yVue34EJPUdZ1S hahL7u5frlRIXo51ed4qSmO1KGCx1/U9hOULFlDoGisqZ3fx1wm7+u/kt5nxBADCa8br 57tchCbGcSRL5Zk6sYTUGCPyxk0Y9bne8ysOHbYMXnW2gKsJ2TP+EOxCya4O8mOYJPcr grpNxHc6O1pXn8jJJ8W06v/Yp9Zv2z9sN6/47+uDiHVFApQsLzEwWt8vrAWwZxrn/+n1 3MHg== X-Forwarded-Encrypted: i=1; AFNElJ92qJOiWMlXJcuC6kmHzYbVFeP6zlbMZVhJ4J+5WyanQWWK2o1NR7Ru0dy8byDcXkxxiXo1tmXQepYSpAg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4sK8UR143v2Z6wswf5inWFNidfGjLqA4Hy77ANX3aHU/MjSAV 4D3L5EofYVOGMazVbu3Nm+AXXS1KNobT3G+Wf+z5kND8YgJDDPOY9hQ3 X-Gm-Gg: Acq92OEtkV0ClEVcjoNWINmf2zNvFgkBwcbmxAKRN3EuzBgg/ioP+js3VHyNaD8MpbJ caWIY0GvfUCMDubKaG7SvXwZfKPJkEfNkvRA8QTKg6HIMrXLPKFrjhb7kkdnhOFMPhGLCphlx1a tGJ94maBCWx2qKim4QyBqnDp48oCN3f0X9RPNV39g+VOnj83nZ1nKIpJxebRmqPJ6y+WykyDqnm UhCreLayOPxO3hNynfz5x1GEqYEPWbvfQUtsJYreqO6iwCLdixM3hH2/sy700f2UX4anqZ1nlwi mOh1qC+1w8xTOsISW/WrVU935YAmUP44dfIySoApuDQwpM5XyysGzRiCKF7Xp9iOcbANEOXsfy5 Wm70GSs0Qd0aObblNWDl3PPdtXUgwXWSLMl3oAaOouNpTe8ywxEvMsVDBujAKDRsZqLRRWUcWAx G0vuDBBeiXLjv7yFKuWNNZGHItpvWJUejAzz2NhSKm7vd2g8A1g/PUM19MT9Az2Ec5boKbFI227 3C+BksZWv5giZgmsq8LcTKxjXm7PzBIif8= X-Received: by 2002:a17:902:ca85:b0:2ba:4086:ecb9 with SMTP id d9443c01a7336-2ba798d564cmr146768185ad.36.1778449206716; Sun, 10 May 2026 14:40:06 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1c5466bsm83471125ad.0.2026.05.10.14.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2026 14:40:06 -0700 (PDT) From: Rosen Penev To: linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] PM: hibernate: Use flexible array for CRC uncompressed buffers Date: Sun, 10 May 2026 14:39:48 -0700 Message-ID: <20260510213948.41750-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The CRC uncompressed buffer pointer array has the same lifetime as struct crc_data, but it is currently allocated separately. That adds another allocation failure path and a matching cleanup branch without providing any extra flexibility. Store the pointer array as a flexible array member and allocate it together with the crc_data using kzalloc_flex(). The array remains zero-initialized, while the allocation and error handling become simpler. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- kernel/power/swap.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index cc4764149e8f..c626e9dc3c1c 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -570,29 +570,23 @@ struct crc_data { wait_queue_head_t done; /* crc update done */ u32 *crc32; /* points to handle's crc32 */ size_t **unc_len; /* uncompressed lengths */ - unsigned char **unc; /* uncompressed data */ + unsigned char *unc[]; /* uncompressed data */ }; static struct crc_data *alloc_crc_data(int nr_threads) { struct crc_data *crc; - crc = kzalloc_obj(*crc); + crc = kzalloc_flex(*crc, unc, nr_threads); if (!crc) return NULL; - crc->unc = kcalloc(nr_threads, sizeof(*crc->unc), GFP_KERNEL); - if (!crc->unc) - goto err_free_crc; - crc->unc_len = kzalloc_objs(*crc->unc_len, nr_threads); if (!crc->unc_len) - goto err_free_unc; + goto err_free_crc; return crc; -err_free_unc: - kfree(crc->unc); err_free_crc: kfree(crc); return NULL; @@ -607,7 +601,6 @@ static void free_crc_data(struct crc_data *crc) kthread_stop(crc->thr); kfree(crc->unc_len); - kfree(crc->unc); kfree(crc); } -- 2.54.0