From patchwork Wed Nov 21 22:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 30255 Received: (qmail 112763 invoked by alias); 21 Nov 2018 22:49:01 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 112577 invoked by uid 89); 21 Nov 2018 22:48:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=prints, fcfprotection, fcf-protection X-HELO: mail-ot1-f52.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CTsdv15rIZCtOUkG9CmhrdvAM6yH07gWH1JhYDsYmTI=; b=OC1xbB3ZPvAcdJPUCA9b64D0qO1JGqA9ntL9tMqRGk/3ufqQYMy99vhEMSqKWjUd41 /D9cjNDPXZWpA6LOlnwAjUD3naE1T5BkpjL0IatIpwUkmLV74HB8sAr2iz0kXv2VF+6t lq0LN/JSUWEclxwKY5t5DXgpGqm5q1Ul/7/TaDvsbD6DxyXc4G8FI4/2yfZEr8SPUtVP oGjhdtNKfDTvhcdmzx4pW55bX8n9G5oKXPH0qfoYeEpjRqiPbcwY3AQkH9+Bn6GmO2W7 TZpCDIdUVFlHIlX749H5rRT5uswUbjHAiJoa/ZBzBP5gmiCOjptl29DAVknK9tgZto8h ajoA== MIME-Version: 1.0 References: <20181120142225.20868-1-hjl.tools@gmail.com> <871s7fenfo.fsf@oldenburg.str.redhat.com> In-Reply-To: <871s7fenfo.fsf@oldenburg.str.redhat.com> From: "H.J. Lu" Date: Wed, 21 Nov 2018 14:48:08 -0800 Message-ID: Subject: Re: [PATCH] x86/CET: Add a re-exec test with legacy bitmap To: Florian Weimer Cc: GNU C Library On Tue, Nov 20, 2018 at 8:14 AM Florian Weimer wrote: > > * H. J. Lu: > > > +/* Nonzero if the program gets called via `exec'. */ > > +static int restart; > > + > > +#define CMDLINE_OPTIONS \ > > + { "restart", no_argument, &restart, 1 }, > > + > > +extern int do_test (int argc, char *argv[]); > > + > > +#include "../test-skeleton.c" > > Please do not use test-skeleton.c for new tests. > > > + if (argc != 1 && argc != 4) > > + error (EXIT_FAILURE, 0, "wrong number of arguments (%d)", argc); > > error prints to standard error and is therefore not appropriate in > tests. > > > + > > + if (argc == 4) > > + execl (argv[0], argv[0], argv[1], argv[2], argv[3], "--direct", > > + "--restart", NULL); > > I think you have to add further makefile changes to support > --disable-hardcoded-path-in-tests. > Like this? From 0e295cd396663c05b74d3dc8a8c3685aa3549058 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 6 Nov 2018 11:02:28 -0800 Subject: [PATCH] x86/CET: Add a re-exec test with legacy bitmap Add a re-exec test with legacy bitmap to verify that legacy bitmap is properly hanlded by kernel. * sysdeps/x86/Makefile (tests): Add tst-cet-legacy-1a. (tst-cet-legacy-1a-ARGS): New. ($(objpfx)tst-cet-legacy-1a): New target. * sysdeps/x86/tst-cet-legacy-1a.c: New file. --- sysdeps/x86/Makefile | 7 ++- sysdeps/x86/tst-cet-legacy-1a.c | 81 +++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 sysdeps/x86/tst-cet-legacy-1a.c diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index f2fd031ac7..7ec46ca100 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -18,8 +18,9 @@ ifeq ($(enable-cet),yes) ifeq ($(subdir),elf) sysdep-dl-routines += dl-cet -tests += tst-cet-legacy-1 tst-cet-legacy-2 tst-cet-legacy-2a \ - tst-cet-legacy-3 tst-cet-legacy-4 +tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \ + tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4 +tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) ifneq (no,$(have-tunables)) tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c endif @@ -38,6 +39,8 @@ CFLAGS-tst-cet-legacy-mod-4.c += -fcf-protection=none $(objpfx)tst-cet-legacy-1: $(objpfx)tst-cet-legacy-mod-1.so \ $(objpfx)tst-cet-legacy-mod-2.so +$(objpfx)tst-cet-legacy-1a: $(objpfx)tst-cet-legacy-mod-1.so \ + $(objpfx)tst-cet-legacy-mod-2.so $(objpfx)tst-cet-legacy-2: $(objpfx)tst-cet-legacy-mod-2.so $(libdl) $(objpfx)tst-cet-legacy-2.out: $(objpfx)tst-cet-legacy-mod-1.so $(objpfx)tst-cet-legacy-2a: $(objpfx)tst-cet-legacy-mod-2.so $(libdl) diff --git a/sysdeps/x86/tst-cet-legacy-1a.c b/sysdeps/x86/tst-cet-legacy-1a.c new file mode 100644 index 0000000000..8fde2968e8 --- /dev/null +++ b/sysdeps/x86/tst-cet-legacy-1a.c @@ -0,0 +1,81 @@ +/* Test for re-exec with legacy bitmap. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +/* Nonzero if the program gets called via `exec'. */ +static int restart; + +#define CMDLINE_OPTIONS \ + { "restart", no_argument, &restart, 1 }, + +extern int do_test (int argc, char *argv[]); + +extern int in_dso_1 (void); +extern int in_dso_2 (void); + +static int +check (void) +{ + if (in_dso_1 () != 0x1234678) + { + puts ("in_dso_1 () != 0x1234678"); + exit (1); + } + + if (in_dso_2 () != 0xbadbeef) + { + puts ("in_dso_2 () != 0xbadbeef"); + exit (1); + } + + return 0; +} + +int +do_test (int argc, char *argv[]) +{ + /* We must have + - one or four parameters left if called initially + + path for ld.so optional + + "--library-path" optional + + the library path optional + + the application name + */ + + if (restart) + return check (); + + if (argc != 2 && argc != 5) + FAIL_EXIT1 ("wrong number of arguments (%d)", argc); + + if (argc == 5) + execl (argv[1], argv[1], argv[2], argv[3], argv[4], "--direct", + "--restart", NULL); + else + execl (argv[1], argv[1], "--direct", "--restart", NULL); + + return -1; +} + +#define TEST_FUNCTION_ARGV do_test +#include -- 2.19.1