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 0F5392288CB; Tue, 8 Apr 2025 11:43:36 +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=1744112616; cv=none; b=cShAYsyP4GKIP4gDrTuvS4eSyxPPCGsCrQ1Qcv/gxpBOke+uQpFyrSYXKBGByGuI34tx+asBgyE/5GbWmeEA/t7aGW8+GQ5uWwtFoD2wukGlgTLRQF3Da0xWlZkcYhZ1tkvhWAiSG6wpBo2Qq3chb1ESgF3CFoJKa9jI41Ntzq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112616; c=relaxed/simple; bh=tdzkpIOEHFfPUrrySmP5NOU9FO7IvHGRCVWfYbnS2bk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uAoAe0arVoddP2MUqwxkNVdDGzVWk0pVKLtHUpK5jXCbqdwa+erGGhZ+5vlhmk7roUTWlmwK7ju769eiEJKRBcYo+QQv1PzXpeLySLxwcjwip89Kt3PTvFclESAq8w7CDjgLy0MHjV6Nmnqe2bNBzlRzPX8NM7bhXMGiLInSs9g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t2t9N19i; 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="t2t9N19i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8402BC4CEE5; Tue, 8 Apr 2025 11:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112615; bh=tdzkpIOEHFfPUrrySmP5NOU9FO7IvHGRCVWfYbnS2bk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2t9N19i/hPZlVvpz6dQRPA+ijWfyybhqDm7ca+IN1e3BR+531zP8HNIsEfXZI5lU T6iTN1aNvpob/uIaUUa0jl7D5nJesTylMn314jDLTzsJgRPJKwQRFa9BEFDdCUFdVp N/n4JXaEc3FGxF/UGpTazl17v9aqgm+EnB11EFqk= 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.15 135/279] selinux: Chain up tool resolving errors in install_policy.sh Date: Tue, 8 Apr 2025 12:48:38 +0200 Message-ID: <20250408104829.983177504@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@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.15-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