Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7488862imu; Thu, 31 Jan 2019 10:56:57 -0800 (PST) X-Google-Smtp-Source: ALg8bN690jHVni9FkvarS/QGBzkeUXOl10+cqXYtsd+1412dA1BEXho+pfJd23HThwhAZ1uUEsE2 X-Received: by 2002:a63:5e43:: with SMTP id s64mr32690244pgb.101.1548961017289; Thu, 31 Jan 2019 10:56:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548961017; cv=none; d=google.com; s=arc-20160816; b=yZzopxFwO4383UC0iFJ7sG7QY7vIErFszfc0ZsHH3rwDMmmnTeAi4wxA/YFEPzty0A 8KLMKNdALFnI7vFqabmVFNkpvNPhHRUECrLBHKyQKNJypBCyrBKRc9tKnYlt4mOW3maj lsiJMrlmikcPiuRCXVgu/Zz0TeqPa0YszxnFqMGvNTAe8uD0zUBZiWToKxCiNGeWj5ez IVRemCvVMsRAOxuDNhJ3JHbDE9U7T7xYZy3jOqVPjU6nZoMIbZ/1XFUPKHxleNtKnXnc XXLC5ArCJD2Qg4vNyR91rkKiH/PaISAIOAn06xbYwdQHaiMceOQ9iZAQJ5FfGJ6i6TLw M2Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=/TicZlPR/6N7+L7RDAEjq1tadE9RvAhbVtZM7loWZtI=; b=oPJAOom5mdLDPQZmF3MmbKzzHTbm5Ek1s4gTD7qgEY+i0VCzAqu1gtm7KxNN4PPjI/ PBPaE2Hh6cUyMKbEB7EpbDdOBWqe531EfApntTnys2cXL+mHb9dJ0N2ANKT8xSeiKt80 Gb+G2pMgSJ1dAZVQ8MKxRoa4eVylcDSoV6e0+2JTl5RCYXJVmGFziTBELZ14+nH95/gx ykEEabJo3LOpyRRQ4ATtCFtqeOVDPAhYpvg53tjp7vUvRZjoZooVqghpDTM04vlPo2sS ES07J86SN3GVmj2WHVFs6wPf5quX4MklFjQlM/ioj9Ftn7UGYlxA0muTXghtSvijTmMu B5cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t4si675036pga.83.2019.01.31.10.56.42; Thu, 31 Jan 2019 10:56:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728340AbfAaS41 (ORCPT + 99 others); Thu, 31 Jan 2019 13:56:27 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54832 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728209AbfAaS4Y (ORCPT ); Thu, 31 Jan 2019 13:56:24 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0VIs5vH034695 for ; Thu, 31 Jan 2019 13:56:23 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qc5uku4kd-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 31 Jan 2019 13:56:23 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jan 2019 18:56:20 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 31 Jan 2019 18:56:18 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0VIuHv27471378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 31 Jan 2019 18:56:17 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C3614C04E; Thu, 31 Jan 2019 18:56:17 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1D7404C04A; Thu, 31 Jan 2019 18:56:16 +0000 (GMT) Received: from localhost.ibm.com (unknown [9.80.107.203]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 31 Jan 2019 18:56:15 +0000 (GMT) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, David Howells , Dave Young , Eric Biederman , Mimi Zohar Subject: [PATCH 2/3] scripts/ima: define a set of common functions Date: Thu, 31 Jan 2019 13:55:35 -0500 X-Mailer: git-send-email 2.7.5 In-Reply-To: <1548960936-7800-1-git-send-email-zohar@linux.ibm.com> References: <1548960936-7800-1-git-send-email-zohar@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19013118-0020-0000-0000-0000030F7AEB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19013118-0021-0000-0000-000021607FBB Message-Id: <1548960936-7800-3-git-send-email-zohar@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-31_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=948 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310141 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define and move get_secureboot_mode() to a common file for use by other tests. Signed-off-by: Mimi Zohar --- tools/testing/selftests/ima/common_lib.sh | 20 ++++++++++++++++++++ tools/testing/selftests/ima/test_kexec_load.sh | 17 +++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100755 tools/testing/selftests/ima/common_lib.sh diff --git a/tools/testing/selftests/ima/common_lib.sh b/tools/testing/selftests/ima/common_lib.sh new file mode 100755 index 000000000000..ae097a634da5 --- /dev/null +++ b/tools/testing/selftests/ima/common_lib.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ + +get_secureboot_mode() +{ + EFIVARFS="/sys/firmware/efi/efivars" + # Make sure that efivars is mounted in the normal location + if ! grep -q "^\S\+ $EFIVARFS efivarfs" /proc/mounts; then + echo "$TEST: efivars is not mounted on $EFIVARFS" >&2 + exit $ksft_skip + fi + + # Get secureboot mode + file="$EFIVARFS/SecureBoot-*" + if [ ! -e $file ]; then + echo "$TEST: unknown secureboot mode" >&2 + exit $ksft_skip + fi + return `hexdump $file | awk '{print substr($4,length($4),1)}'` +} diff --git a/tools/testing/selftests/ima/test_kexec_load.sh b/tools/testing/selftests/ima/test_kexec_load.sh index 74423c4229e2..5e3566738888 100755 --- a/tools/testing/selftests/ima/test_kexec_load.sh +++ b/tools/testing/selftests/ima/test_kexec_load.sh @@ -5,7 +5,7 @@ # is booted in secureboot mode. TEST="$0" -EFIVARFS="/sys/firmware/efi/efivars" +. ./common_lib.sh rc=0 # Kselftest framework requirement - SKIP code is 4. @@ -17,19 +17,8 @@ if [ $(id -ru) != 0 ]; then exit $ksft_skip fi -# Make sure that efivars is mounted in the normal location -if ! grep -q "^\S\+ $EFIVARFS efivarfs" /proc/mounts; then - echo "$TEST: efivars is not mounted on $EFIVARFS" >&2 - exit $ksft_skip -fi - -# Get secureboot mode -file="$EFIVARFS/SecureBoot-*" -if [ ! -e $file ]; then - echo "$TEST: unknown secureboot mode" >&2 - exit $ksft_skip -fi -secureboot=`hexdump $file | awk '{print substr($4,length($4),1)}'` +get_secureboot_mode +secureboot=$? # kexec_load should fail in secure boot mode KERNEL_IMAGE="/boot/vmlinuz-`uname -r`" -- 2.7.5