Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp4280890img; Tue, 26 Mar 2019 06:36:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqz38ETFgSe5/s/Ni3+VxQ6igFBogWsWuFXQFlcEshdeBunac+sNlGeQG+MrFOOZA0OjgcQp X-Received: by 2002:a65:53c1:: with SMTP id z1mr22048696pgr.415.1553607388379; Tue, 26 Mar 2019 06:36:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553607388; cv=none; d=google.com; s=arc-20160816; b=0tGzlUmBxoaXlavlpClPt/3VLfwrb8/Alrw+MkSsmukrCkUv6H+LTNDcnUH0FC+D5w mJpsCkcTuHQk+dBV5xzZn9AgqTHcuF32qaEEvSteGHH2vwWghrqZz+wNvj8KEkQhCTyM 4CsfHTkIwE648+Ui5blObnFAZ6kiJ01mm0sETjuaTUG4d5X3qeX07QK3uKyLcWWtYnGh pONEPKw/b/McvUiGoj/14qDZNMP3iNuebSyUVUFqwz7k6+bf3OpXEEt/kqbcRPFUBTaR rk3iKOxrAbevdAI8w/LXlOtCFhnK9iTt22MMIVyDfbb/OZPc2BKjYoSbe61KXsqPOO0X iU/g== 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=YCpglvAwdtg8VCsLCusPvOJ0+7TU6wM0cvJYaf85reA=; b=gtqAyksUpTeqs3qxGLBAIGGqItCX6PKrLtxR/IKBhH523O9AcN9vILljeI5QvvNpPS LoLmAa3NgPMhv547zz4mt5n2cNz8AxuVmpdVo+h99bFAzSpK1696shC7YArC0WC6878W DrQYOik0GNbm418ES/Xk95+mMd51aPvMH+FrqXHqGarCzXDTfsu8sgOBqMtRCy3Rr9j6 PR5ptXB3nLDUQEeuvLH6W5wxfiAebW683MY7/Xfa34WukXFWuHka6MtyFA1q0wKtTGr3 Xz5BpLRUlhXDlSX41PpSzzo7LnBXKorcJbhEnBRQltalEFA6EpbI2UtBOmUqOex2Ge2t WWUg== 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 r12si15492975pgv.293.2019.03.26.06.36.13; Tue, 26 Mar 2019 06:36:28 -0700 (PDT) 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 S1731659AbfCZNfa (ORCPT + 99 others); Tue, 26 Mar 2019 09:35:30 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36502 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731640AbfCZNf3 (ORCPT ); Tue, 26 Mar 2019 09:35:29 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2QDZFBh073642 for ; Tue, 26 Mar 2019 09:35:28 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2rfm7gk0a6-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2019 09:35:27 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Mar 2019 13:35:23 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 26 Mar 2019 13:35:19 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2QDZI0b61538350 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 13:35:18 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 78BC911C04C; Tue, 26 Mar 2019 13:35:18 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3FE6B11C04A; Tue, 26 Mar 2019 13:35:17 +0000 (GMT) Received: from localhost.ibm.com (unknown [9.80.109.68]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 26 Mar 2019 13:35:16 +0000 (GMT) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: linux-kselftest@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Petr Vorel , Dave Young , Matthew Garrett , Mimi Zohar Subject: [PATCH v5 8/9] selftests/kexec: check kexec_load and kexec_file_load are enabled Date: Tue, 26 Mar 2019 09:34:16 -0400 X-Mailer: git-send-email 2.7.5 In-Reply-To: <1553607257-18906-1-git-send-email-zohar@linux.ibm.com> References: <1553607257-18906-1-git-send-email-zohar@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19032613-0016-0000-0000-000002674FDA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19032613-0017-0000-0000-000032C285D9 Message-Id: <1553607257-18906-9-git-send-email-zohar@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-26_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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903260096 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Skip the kexec_load and kexec_file_load tests, if they aren't configured in the kernel. This change adds a new requirement that ikconfig is configured in the kexec_load test. Suggested-by: Dave Young Signed-off-by: Mimi Zohar --- tools/testing/selftests/kexec/test_kexec_file_load.sh | 5 +++++ tools/testing/selftests/kexec/test_kexec_load.sh | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/tools/testing/selftests/kexec/test_kexec_file_load.sh b/tools/testing/selftests/kexec/test_kexec_file_load.sh index 4603282dd8b6..fa7c24e8eefb 100755 --- a/tools/testing/selftests/kexec/test_kexec_file_load.sh +++ b/tools/testing/selftests/kexec/test_kexec_file_load.sh @@ -163,6 +163,11 @@ require_root_privileges # get the kernel config get_kconfig +kconfig_enabled "CONFIG_KEXEC_FILE=y" "kexec_file_load is enabled" +if [ $? -eq 0 ]; then + log_skip "kexec_file_load is not enabled" +fi + # Determine which kernel config options are enabled kconfig_enabled "CONFIG_IMA_APPRAISE=y" "IMA enabled" ima_appraise=$? diff --git a/tools/testing/selftests/kexec/test_kexec_load.sh b/tools/testing/selftests/kexec/test_kexec_load.sh index afd440ee23cb..2a66c8897f55 100755 --- a/tools/testing/selftests/kexec/test_kexec_load.sh +++ b/tools/testing/selftests/kexec/test_kexec_load.sh @@ -10,6 +10,14 @@ TEST="$0" # kexec requires root privileges require_root_privileges +# get the kernel config +get_kconfig + +kconfig_enabled "CONFIG_KEXEC=y" "kexec_load is enabled" +if [ $? -eq 0 ]; then + log_skip "kexec_load is not enabled" +fi + get_secureboot_mode secureboot=$? -- 2.7.5