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 C750B267B89; Tue, 8 Apr 2025 11:50:44 +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=1744113044; cv=none; b=o3EdrDNYksCcq0jLmWpkam36hcYk73NOdlrPuUiBoefJUVWJ8u+TbQJ7CvzNbOvAB69EFSozu40FvYRpb6cZlPI+5YlYKvQ03cOqfzh/zeeA6Q/2YvIse1tqoMCTBXU6rY1vbzaJ1+gYwZhAOmYs87izw+D9MzoQk1ArnF0bFRk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113044; c=relaxed/simple; bh=eg0VsIdB+G8O8kARkaCq4k4unAuuGCUwlO0s9JdGc8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WOkKDSAG8M7HVlyqgSNi0Iv97fFrY5wDqfQ+xoEW3w4gLacghtd6S204tC1EOcwbJLgOfJyruEKOAcypE+mPHL5vpWK7CAFtmlP+jEx/SBtAzmy2la5uZNwsXlTgG+7uZeLWZhxByGhCBrbBVWIgO6Emprn+BZMhrS6mfhnPYS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vwy5aaYj; 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="Vwy5aaYj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDB26C4CEE5; Tue, 8 Apr 2025 11:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113044; bh=eg0VsIdB+G8O8kARkaCq4k4unAuuGCUwlO0s9JdGc8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vwy5aaYjB/qX+W6Dt0m4WwcZ2+KiSA9EemM3qBjsLdspOQcNKl7/nckjgrPQJEGhQ aShgeSbtAZVHZx7mEAdSd2irfcPXo6alUsoQgOX5I1lfJACSQx7e6x1CRPTx2AtNg2 FZwLGlaFEvgYLUkeTcJxVe5DlmvJcXvzGTleRALc= 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 6.6 014/268] selinux: Chain up tool resolving errors in install_policy.sh Date: Tue, 8 Apr 2025 12:47:05 +0200 Message-ID: <20250408104828.896185335@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104828.499967190@linuxfoundation.org> References: <20250408104828.499967190@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 6.6-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 24086793b0d8d..db40237e60ce7 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