From patchwork Wed Oct 23 13:43:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vit Mojzis X-Patchwork-Id: 13847121 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 1A98E1AAE02 for ; Wed, 23 Oct 2024 13:43:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729691040; cv=none; b=JVHXjif8a2O2sjxasJw72EoN41F40DwUSH20rWv+2Y+o4LHh67XlqMEtWU2fhC2m1/Azl7GW1zg5V7ipisrJZUzBAkwN1WyaBPLM9pw4qleCcIh8oZqX7MmpCf0nccERNgRAX9FwJ48vEWIYSlcFR98Bh+dEDK20jnB8U/YJmHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729691040; c=relaxed/simple; bh=+cwYIZnbNVeipG7kuWSyYqiYU9n7VBdxpU9bjyFTltI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mr+MHbjBRJyb3l06f4/xKvuMz6WvvoLZbgOlI/8ZaRwEVHGzlUkHsL73nmz+i1CYTfD5tkeVpOTZsyr5Ac+b31QTXbbqR36YXqnYGkrn9oPqg/yMVODc2IsO8lMcERbKAvHxgGl1sHHWBx+OEwmn7CrQjWx+z9HPOspo3DIGJgE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TetuhwH/; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TetuhwH/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729691038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBovyVCks93imgd3Ar2i2bSgf7MjSQfEpKOKbXi7CLM=; b=TetuhwH/j5+TKHoHzzySsF98CrBQ30Ij1paS824gvxsC8sJgMNwlSw1eZHdHrlRqRHfz0B w7mj4Q5Jg0AoDd9psQBOQrOzPZVoAu03dRgY6g3grvSD4UT8AYYZfwsWyaAjE/bPDQ70DN BZOou01H0UEugtYKcdIRh2pshUDcW7I= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-681-UMTDfAveP7iy3RL68NgD9Q-1; Wed, 23 Oct 2024 09:43:56 -0400 X-MC-Unique: UMTDfAveP7iy3RL68NgD9Q-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87B1919054F1 for ; Wed, 23 Oct 2024 13:43:39 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.164]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C946E19560A2 for ; Wed, 23 Oct 2024 13:43:38 +0000 (UTC) From: Vit Mojzis To: selinux@vger.kernel.org Subject: [PATCH v2 4/4] libsepol: Initialize "strs" on declaration Date: Wed, 23 Oct 2024 15:43:18 +0200 Message-ID: <20241023134318.733305-4-vmojzis@redhat.com> In-Reply-To: <20241023134318.733305-1-vmojzis@redhat.com> References: <20241023134318.733305-1-vmojzis@redhat.com> Precedence: bulk X-Mailing-List: selinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 The value of "strs" was not always initialized before being used by strs_destroy. Fixes: Error: UNINIT (CWE-457): libsepol-3.7/src/kernel_to_cil.c:1439:2: var_decl: Declaring variable "strs" without initializer. libsepol-3.7/src/kernel_to_cil.c:1487:2: uninit_use_in_call: Using uninitialized value "strs" when calling "strs_destroy". \# 1485| \# 1486| exit: \# 1487|-> strs_destroy(&strs); \# 1488| \# 1489| if (rc != 0) { Error: UNINIT (CWE-457): libsepol-3.7/src/kernel_to_conf.c:1422:2: var_decl: Declaring variable "strs" without initializer. libsepol-3.7/src/kernel_to_conf.c:1461:2: uninit_use_in_call: Using uninitialized value "strs" when calling "strs_destroy". \# 1459| \# 1460| exit: \# 1461|-> strs_destroy(&strs); \# 1462| \# 1463| if (rc != 0) { Signed-off-by: Vit Mojzis --- libsepol/src/kernel_to_cil.c | 2 +- libsepol/src/kernel_to_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c index 7243b3c0..2d563e7d 100644 --- a/libsepol/src/kernel_to_cil.c +++ b/libsepol/src/kernel_to_cil.c @@ -1436,7 +1436,7 @@ static int map_type_aliases_to_strs(char *key, void *data, void *args) static int write_type_alias_rules_to_cil(FILE *out, struct policydb *pdb) { type_datum_t *alias; - struct strs *strs; + struct strs *strs = NULL; char *name; char *type; unsigned i, num = 0; diff --git a/libsepol/src/kernel_to_conf.c b/libsepol/src/kernel_to_conf.c index ca91ffae..661546af 100644 --- a/libsepol/src/kernel_to_conf.c +++ b/libsepol/src/kernel_to_conf.c @@ -1419,7 +1419,7 @@ static int map_type_aliases_to_strs(char *key, void *data, void *args) static int write_type_alias_rules_to_conf(FILE *out, struct policydb *pdb) { type_datum_t *alias; - struct strs *strs; + struct strs *strs = NULL; char *name; char *type; unsigned i, num = 0;