Commit f33dece7 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Borislav Petkov
Browse files

selftests/sgx: Use getauxval() to simplify test code 



Use the library function getauxval() instead of a custom function to get
the base address of the vDSO.

 [ bp: Massage commit message. ]

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20210314111621.68428-1-tianjia.zhang@linux.alibaba.com
parent 4284f7ac

tools/testing/selftests/sgx/main.c

+4 −20
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <sys/stat.h>

#include <sys/time.h>

#include <sys/types.h>

#include <sys/auxv.h>

#include "defines.h"

#include "main.h"

#include "../kselftest.h"
@@ -28,24 +29,6 @@ struct vdso_symtab { 
	Elf64_Word *elf_hashtab;

};



static void *vdso_get_base_addr(char *envp[])

{

	Elf64_auxv_t *auxv;

	int i;



	for (i = 0; envp[i]; i++)

		;



	auxv = (Elf64_auxv_t *)&envp[i + 1];



	for (i = 0; auxv[i].a_type != AT_NULL; i++) {

		if (auxv[i].a_type == AT_SYSINFO_EHDR)

			return (void *)auxv[i].a_un.a_val;

	}



	return NULL;

}



static Elf64_Dyn *vdso_get_dyntab(void *addr)

{

	Elf64_Ehdr *ehdr = addr;
@@ -162,7 +145,7 @@ static int user_handler(long rdi, long rsi, long rdx, long ursp, long r8, long r 
	return 0;

}



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 = encl.encl_base;



	addr = vdso_get_base_addr(envp);

	/* Get vDSO base address */

	addr = (void *)getauxval(AT_SYSINFO_EHDR);

	if (!addr)

		goto err;