From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02B74C433E0 for ; Mon, 18 Jan 2021 13:33:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 88EE3221EB for ; Mon, 18 Jan 2021 13:33:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88EE3221EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D0FF76B0283; Mon, 18 Jan 2021 08:33:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CC0F16B0285; Mon, 18 Jan 2021 08:33:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFD9F6B0286; Mon, 18 Jan 2021 08:33:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id AAEDE6B0283 for ; Mon, 18 Jan 2021 08:33:34 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 63AC8180AD802 for ; Mon, 18 Jan 2021 13:33:34 +0000 (UTC) X-FDA: 77718987948.05.hand66_11171de27549 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 48F7B18000DC5 for ; Mon, 18 Jan 2021 13:33:34 +0000 (UTC) X-HE-Tag: hand66_11171de27549 X-Filterd-Recvd-Size: 3421 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Mon, 18 Jan 2021 13:33:31 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R431e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0UM8ExIN_1610976801; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0UM8ExIN_1610976801) by smtp.aliyun-inc.com(127.0.0.1); Mon, 18 Jan 2021 21:33:21 +0800 From: Tianjia Zhang To: Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Andrew Morton , Shuah Khan , haitao.huang@intel.com, Kai Huang , x86@kernel.org, linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Jia Zhang Cc: Tianjia Zhang Subject: [PATCH] selftests/x86: Simplify the code of getting vdso base address in sgx Date: Mon, 18 Jan 2021 21:33:21 +0800 Message-Id: <20210118133321.98655-1-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.3.ge56e4f7 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The base address of vDSO can be obtained through the library function `getauxval()`, so use `getauxval(AT_SYSINFO_EHDR)` instead of a custom implementation to simplify the code. Reported-by: Jia Zhang Signed-off-by: Tianjia Zhang --- tools/testing/selftests/sgx/main.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests= /sgx/main.c index 724cec700926..365d01dea67b 100644 --- a/tools/testing/selftests/sgx/main.c +++ b/tools/testing/selftests/sgx/main.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "defines.h" #include "main.h" #include "../kselftest.h" @@ -28,24 +29,6 @@ struct vdso_symtab { Elf64_Word *elf_hashtab; }; =20 -static void *vdso_get_base_addr(char *envp[]) -{ - Elf64_auxv_t *auxv; - int i; - - for (i =3D 0; envp[i]; i++) - ; - - auxv =3D (Elf64_auxv_t *)&envp[i + 1]; - - for (i =3D 0; auxv[i].a_type !=3D AT_NULL; i++) { - if (auxv[i].a_type =3D=3D AT_SYSINFO_EHDR) - return (void *)auxv[i].a_un.a_val; - } - - return NULL; -} - static Elf64_Dyn *vdso_get_dyntab(void *addr) { Elf64_Ehdr *ehdr =3D addr; @@ -162,7 +145,7 @@ static int user_handler(long rdi, long rsi, long rdx,= long ursp, long r8, long r return 0; } =20 -int main(int argc, char *argv[], char *envp[]) +int main(int argc, char *argv[]) { struct sgx_enclave_run run; struct vdso_symtab symtab; @@ -203,7 +186,8 @@ int main(int argc, char *argv[], char *envp[]) memset(&run, 0, sizeof(run)); run.tcs =3D encl.encl_base; =20 - addr =3D vdso_get_base_addr(envp); + /* Get vDSO base address */ + addr =3D (void *)(uintptr_t)getauxval(AT_SYSINFO_EHDR); if (!addr) goto err; =20 --=20 2.19.1.3.ge56e4f7