Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4044423pxj; Mon, 21 Jun 2021 12:10:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx62VgDBiywu3cLw0zwTEmJ+CiqGDi+qmi6f3xEox8AfXGWWp3k+C+EkMqBjSi6GmmUv4UJ X-Received: by 2002:a05:6402:348f:: with SMTP id v15mr23115455edc.135.1624302623207; Mon, 21 Jun 2021 12:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624302623; cv=none; d=google.com; s=arc-20160816; b=m9NiSBC61pgbAZKcHfj+uH8YefqsuK4XwTGQXmHh8unWQwlbDG/JExCtokpt6DCo49 Iz/6VHm0xwEGqiaLAOyIlkRz8sfWoNvKrfiMUG/DBVBQfriweFY4xDbx9K97lG5kLDWi aho+38ZvvNqwDpw4FFR1SrypAKXGUCk1N0URsmdCE7ldNvAsjTUeyhqWK2WwOLSyylfB MczRWcKRiQ8i5aPkWq0LfP+NgEn77QAUIRPkO7PcvmiJV1qOA/PBsIeLIE7w3elKFolP mJlS4zZw1m8fdk8Z8GB7DWh90wQCRDqhj8rhd/wyes+9NMltDtKvPgmtnVbcnfNyKW2x AHWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:from:cc:to:subject:ironport-sdr :ironport-sdr; bh=PU38gJ9sG+TxPvKiSxERJsrIQXarXn0PCbF39Sks/4M=; b=ZfkmGucQr/PoMVIjwnPQ2P4PxGQ7KevsknhSqHrp3deRVPHi5MtXAQlMR7a26WD7If Vtqk78eLL18uw9hZ0sg78EmNvq1ZDorm11sPTWPuNvEMyE1LQa1RHYBhks0blDDyuilx JR8GgSs9TvSQr/qY4andif8AH5UKGVTUaB3rr0HnnXdkTg+9t05MgwwEosYlZHKPudm8 pkPyz4s9e4w9L+eQGt3bMIB4AJBIh/AWSpnRz38cZC0Jv6SezWBFHPDxHs65G8qwuQaG 949SQk3btx/gGGM1dFp4NINEMTHPzUMsNXBB6Lrqcr3vqRBAHr+BDsEZ0BuJQmNCShk9 BM5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y12si245510edc.348.2021.06.21.12.09.44; Mon, 21 Jun 2021 12:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231367AbhFUTIx (ORCPT + 99 others); Mon, 21 Jun 2021 15:08:53 -0400 Received: from mga17.intel.com ([192.55.52.151]:60414 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbhFUTIw (ORCPT ); Mon, 21 Jun 2021 15:08:52 -0400 IronPort-SDR: cXHMRXQz4mGFt8clh0K/+U60tuEvJGnG9o8q3y2PDpQeeAg/J21wpyRflPDzQwN1gIFu7q8Bjq gvhORtvMmfcg== X-IronPort-AV: E=McAfee;i="6200,9189,10022"; a="187293641" X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="187293641" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2021 12:06:37 -0700 IronPort-SDR: z75lA64KpVlDa81rKjUVEAaNoYT9JJwKTUEy4mZGDOJKS4BvtY3G4Ps0S59j1/vwGbGelPPs2N 16KUGjrgClIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="405721024" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.77.144]) by orsmga006.jf.intel.com with ESMTP; 21 Jun 2021 12:06:36 -0700 Subject: [PATCH] selftests/sgx: remove checks for file execute permissions To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Dave Hansen , tim.gardner@canonical.com, jarkko@kernel.org, reinette.chatre@intel.com, shuah@kernel.org, linux-sgx@vger.kernel.org, linux-kselftest@vger.kernel.org From: Dave Hansen Date: Mon, 21 Jun 2021 12:05:56 -0700 Message-Id: <20210621190556.4B5DCBB1@viggo.jf.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The SGX selftests can fail for a bunch of non-obvious reasons like 'noexec' permissions on /dev (which is the default *EVERYWHERE* it seems). A new test mistakenly also looked for +x permission on the /dev/sgx_enclave. File execute permissions really only apply to the ability of execve() to work on a file, *NOT* on the ability for an application to map the file with PROT_EXEC. SGX needs to mmap(PROT_EXEC), but doesn't need to execve() the device file. Remove the check. Fixes: 4284f7acb78b ("selftests/sgx: Improve error detection and messages") Reported-by: Tim Gardner Cc: Jarkko Sakkinen Cc: Reinette Chatre Cc: Dave Hansen Cc: Shuah Khan Cc: linux-sgx@vger.kernel.org Cc: linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- b/tools/testing/selftests/sgx/load.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff -puN tools/testing/selftests/sgx/load.c~sgx-no-file-exec tools/testing/selftests/sgx/load.c --- a/tools/testing/selftests/sgx/load.c~sgx-no-file-exec 2021-06-21 11:48:25.226294281 -0700 +++ b/tools/testing/selftests/sgx/load.c 2021-06-21 12:03:28.023292029 -0700 @@ -150,16 +150,6 @@ bool encl_load(const char *path, struct goto err; } - /* - * This just checks if the /dev file has these permission - * bits set. It does not check that the current user is - * the owner or in the owning group. - */ - if (!(sb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) { - fprintf(stderr, "no execute permissions on device file %s\n", device_path); - goto err; - } - ptr = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, 0); if (ptr == (void *)-1) { perror("mmap for read"); @@ -169,13 +159,13 @@ bool encl_load(const char *path, struct #define ERR_MSG \ "mmap() succeeded for PROT_READ, but failed for PROT_EXEC.\n" \ -" Check that current user has execute permissions on %s and \n" \ -" that /dev does not have noexec set: mount | grep \"/dev .*noexec\"\n" \ +" Check that /dev does not have noexec set:\n" \ +" \tmount | grep \"/dev .*noexec\"\n" \ " If so, remount it executable: mount -o remount,exec /dev\n\n" ptr = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_SHARED, fd, 0); if (ptr == (void *)-1) { - fprintf(stderr, ERR_MSG, device_path); + fprintf(stderr, ERR_MSG); goto err; } munmap(ptr, PAGE_SIZE); _