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 4E522267F6C; Tue, 8 Apr 2025 11:05:55 +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=1744110356; cv=none; b=kFtbiew5TO7vdmMNCuEprlPEeBlXDRMeigni8okstQBOxsf8jlMO4znLHQ9wBvL859cxlYwrSuMCDmxPK4Y641kVHxyry/MIX13YBtnBRZ/4XZlRD5+iZQQWD/troycwUu3DtWiN3MNwbZCZ3dPbD3O2JJsu0R1KQd7pGwElFC0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110356; c=relaxed/simple; bh=T7/5vxxMs7qguEBdcxedFCg2YyrIaL3EX0NIQvp1U78=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j721Hdl54PfblgI4Tcv7cSUJho26AwMNIQls5ZEJKmQ4dp6EJ3nsF6OALAqmASok2tMtVnR7ASZNLNLJOuwnmjYChYjd5a7ydYk6aCgEI1kOMXGdJIlUSu0u5io3gHtk19Ago84U/q70UEkIFxrD2wDvoZKlRl/RLA8uLkqsXsw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jhxODwxa; 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="jhxODwxa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 729F4C4CEE5; Tue, 8 Apr 2025 11:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744110355; bh=T7/5vxxMs7qguEBdcxedFCg2YyrIaL3EX0NIQvp1U78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jhxODwxaXrbLYfNj4tdprATGvMc/a/y8q1sp8I+nmJjLBIoCoo3mE0gjQ+txYCJTK 9UB/+wdi6CKNws2H/MJk7Qy/YjWd9E706WfPEBsh7oxQzo3Pz+lkc0j8Fs5O2D/480 R104BgMSyyDscbztOBI1TmebHSf5UuM0UngLnbC8= 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.14 032/731] selinux: Chain up tool resolving errors in install_policy.sh Date: Tue, 8 Apr 2025 12:38:49 +0200 Message-ID: <20250408104915.016541327@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 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 6.14-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