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 9D58243F4C3; Mon, 31 Aug 2026 14:03:07 +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=1788184988; cv=none; b=WjgKU309g8A0sXRuv8sJ926NA92KzY6uov7ayGxDhN1Gdo+vTJQn/tbV/5suMTIFEnZ6bEMFZ8DKYfbm4dXUWqTzVyIT5q9gf47FntMBN0rjpYheYwWGZKZNggA/jR98al882w10JzW2B9kSwQ9uq1conJNpODQfecPXEzOQtM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788184988; c=relaxed/simple; bh=e7CINLRZeO+JjZ2YlFlJXh7gEu5H2MN1YrjhXqRTKnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oWWNm+s9ASPE/LDBz7Bh2mg87EEI/2RKB26zr5oY1cZBfmw9bN+fW/3Y9gkzRAlpmbgqtMU9XS0+5YkqGpzI+4s6v0Z8DvNyXhJgZLmJNiAf1c1IFFQijjgc1Lw8FgvBM8DVuRrypohN2+RczVm7a+BF47O6jZObMmsyGD1wh70= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PK2beNs7; 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="PK2beNs7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECFA61F000E9; Mon, 31 Aug 2026 14:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788184987; bh=A3Q3HVikSGwkogg9nT6ftUazrKuvHFPDDsw+B1tU6+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PK2beNs7PAkAHUePNIDVI2Q/jTR/ipA9uokg8CJNQFfK5+9b7msv0xrgHTYBo5Kh/ avNh5lZN7rACUGolJmwBrJK3gcLvl3UiWjPcol1c9+64XCiVtJvvYpK7uk2qiEXTA/ vN1bLlww3KXgUstsdjv9O82ojsW26kFPpdpXOYdM= 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 5.15 15/69] selinux: switch two allocations to use kzalloc_objs() Date: Mon, 31 Aug 2026 15:34:48 +0200 Message-ID: <20260831133359.237804717@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831133358.601894154@linuxfoundation.org> References: <20260831133358.601894154@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 5.15-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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index feb206f3acb4a..12a2c5ef80813 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -166,9 +166,9 @@ 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->p_bools.nprim, - sizeof(*p->bool_val_to_struct), - GFP_KERNEL); + 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; return 0; @@ -716,9 +716,9 @@ 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