From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0627A58B6B3; Mon, 31 Aug 2026 13:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788184232; cv=none; b=lHhgG+bK73FFJ1QqdN4mKhHcAmYv/swY8n3A5J70X8wQeKFxxkKw0YrDc+1QmZ65fBl7zauzBHsI5pfcsXoKaARkQRzYXTuCP6NHIE/MBWDHtyZveTKJVzbYmkGzo2PS+q05JXymOybol71Iocg+K2v8SfFhgfiku9f+vlRjr4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788184232; c=relaxed/simple; bh=W4ETtu5yXk4eMc2hAlzBqjWtdiazUqrz4BOfNefsrIE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pxIgtEApXHIiK3W6UZgYzW4e2Bnn0TKQGAxEt+JbEKXc61eiSzKc3NxMN8GYopDgMGFkP1YlouTkXe+Cfo7p6PD9O8DRd7EnZTYG5/7YQWQVIGWfccsetm9UlFN5e9H9R2e75YIWgZt89Y0OOWnbeSvSLeiAY0chRq6C62fzIMw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E6blPNLE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="E6blPNLE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08E651F00A3F; Mon, 31 Aug 2026 13:50:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788184230; bh=nG8AJkd1wgiMLO02hJfXSDmnEWWwL7xxdGQ54+AmCY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=E6blPNLE/p8+bk7NeuromgFppwliNtSOZJe26jqlu0YN2Dfl1Y5yEs8RFC3IP3rc2 j/QzqtKaVuq2B+wx50wLcVVkW75jwONfL/hLqDpxLIyTcjXwokgSI0f2nDTtiPmNx3 ixCfV7HEmPHrhUtkUYu0tfN8KNteHkwWIVqi1vw0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stephen Smalley , Paul Moore , Sasha Levin Subject: [PATCH 6.12 36/99] selinux: switch two allocations to use kzalloc_objs() Date: Mon, 31 Aug 2026 15:34:05 +0200 Message-ID: <20260831133401.824920028@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831133359.740409777@linuxfoundation.org> References: <20260831133359.740409777@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Smalley [ Upstream commit cf6a513f1937581eb012a217b29817e025a1a0ef ] These were the only two allocations in the policy loading logic that were not already using kzalloc_objs() for the policy data structures. Fix these to be consistent with the rest and to protect against ill-formed policy. Signed-off-by: Stephen Smalley Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- security/selinux/ss/conditional.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index c15d914671ddd..d0e293051452e 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -165,7 +165,7 @@ void cond_policydb_destroy(struct policydb *p) int cond_init_bool_indexes(struct policydb *p) { kfree(p->bool_val_to_struct); - p->bool_val_to_struct = kmalloc_array( + p->bool_val_to_struct = kcalloc( p->p_bools.nprim, sizeof(*p->bool_val_to_struct), GFP_KERNEL); if (!p->bool_val_to_struct) return -ENOMEM; @@ -706,9 +706,8 @@ static int duplicate_policydb_bools(struct policydb *newdb, struct cond_bool_datum **cond_bool_array; int rc; - cond_bool_array = kmalloc_array(orig->p_bools.nprim, - sizeof(*orig->bool_val_to_struct), - GFP_KERNEL); + cond_bool_array = kcalloc(orig->p_bools.nprim, + sizeof(*orig->bool_val_to_struct), GFP_KERNEL); if (!cond_bool_array) return -ENOMEM; -- 2.53.0