From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 67AC1264627; Tue, 8 Apr 2025 12:05:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113956; cv=none; b=P1V/FE4PdT+E2HWVcBZ8hAZh2TH1EnBO4QFSXpUYLPLbmNm6uMu51VULYtN2VNLoj+724Bgr/AEfXO4zGqc4NUaNxmv6lIbsmUVMf/ZVQ0MJL0JmreomBHC08UkQlI2E1JLWfO+K6b42LhymxT+VqPbAurrUk/b8pCJeV8o0iiM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113956; c=relaxed/simple; bh=KjyDL+Ssa6GlbKbUbzdY+VEMCES3AmHrnGXEi4S03so=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OXhzpReEwcHj8R1Gnu7n/H8aRu8gIXcJGBdbmu1owja/rzxLTsVNO1HB3l7lXAf2RZGJdiKTIowvnyXEgZzICfZMBPuv5l0aRNnHBJz7l8k8O/IsuikthP1I+v72a2UlBAaJGtATSa8NPj6CrV7lycSOxqoTaWrLlVn5Hv940Yg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PWVkFOhL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PWVkFOhL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDD66C4CEE5; Tue, 8 Apr 2025 12:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113956; bh=KjyDL+Ssa6GlbKbUbzdY+VEMCES3AmHrnGXEi4S03so=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PWVkFOhLTHhfpj8Am47UA4dKuCiJJpHRmwwXBaVEhZHlR8iftG1V4XJKRAqNr83+1 lMxECIQc9raNbhIU2ljuWNNrKHhhlvkcvbpQK+VTkmHgi+nWA9+Z+PWGPSN8h863oY /0ACuClZzJYUkSx4lNH5yadqO6XWr6H7nVWlNGI0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tim Schumacher , Paul Moore , Sasha Levin Subject: [PATCH 5.4 084/154] selinux: Chain up tool resolving errors in install_policy.sh Date: Tue, 8 Apr 2025 12:50:25 +0200 Message-ID: <20250408104818.006081403@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104815.295196624@linuxfoundation.org> References: <20250408104815.295196624@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tim Schumacher [ Upstream commit 6ae0042f4d3f331e841495eb0a3d51598e593ec2 ] Subshell evaluations are not exempt from errexit, so if a command is not available, `which` will fail and exit the script as a whole. This causes the helpful error messages to not be printed if they are tacked on using a `$?` comparison. Resolve the issue by using chains of logical operators, which are not subject to the effects of errexit. Fixes: e37c1877ba5b1 ("scripts/selinux: modernize mdp") Signed-off-by: Tim Schumacher Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- scripts/selinux/install_policy.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh index 20af56ce245c5..c68f0e045fb00 100755 --- a/scripts/selinux/install_policy.sh +++ b/scripts/selinux/install_policy.sh @@ -6,27 +6,24 @@ if [ `id -u` -ne 0 ]; then exit 1 fi -SF=`which setfiles` -if [ $? -eq 1 ]; then +SF=`which setfiles` || { echo "Could not find setfiles" echo "Do you have policycoreutils installed?" exit 1 -fi +} -CP=`which checkpolicy` -if [ $? -eq 1 ]; then +CP=`which checkpolicy` || { echo "Could not find checkpolicy" echo "Do you have checkpolicy installed?" exit 1 -fi +} VERS=`$CP -V | awk '{print $1}'` -ENABLED=`which selinuxenabled` -if [ $? -eq 1 ]; then +ENABLED=`which selinuxenabled` || { echo "Could not find selinuxenabled" echo "Do you have libselinux-utils installed?" exit 1 -fi +} if selinuxenabled; then echo "SELinux is already enabled" -- 2.39.5