From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by sourceware.org (Postfix) with ESMTPS id 1B2383898524 for ; Thu, 30 Apr 2020 19:34:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1B2383898524 Received: by mail-pl1-x644.google.com with SMTP id w3so2667050plz.5 for ; Thu, 30 Apr 2020 12:34:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KvsFye7lbEHj4vXeN42ziZ+TsNjcGxKnHWRVbmctyH0=; b=VnTZ+0ItOtdW3AGw3FGMGQKIVRVmbV1i400+ZSHgwfy9RujNXPY+DYv5+Xj4ayTsXi BaLRuFgS/WlNOqEJXMniXSTEZfvBaU1Pl7tDmqVmChd1a6cQ0njeOqmBn1TO4/Sro0XM zIOA49GYcu7sXcC9/ZtPSE3yzAoYY/IVoseJQXKIITa5Yc6utWYuavie+7a3p142RMRj Dj4yXeXTkjY/1PNWaSxSGPVfGRKqVkoPJ9ovJQzjfb4AAwrhFX41xUS4ib73ylPGS2b3 YbY9vG+pPneCgRax3EndP2D/bY+tDvRphj4+2D/iVLPWW93Wmaiv+/d4pK8z1yFDA8+V rYyA== X-Gm-Message-State: AGi0PuYv0kADF+dG7ALnUnUCm06uNceNZSapEVE8tW64SDWl3/DnL0ex UpHt+kpsfWcR5aPt5z2ejtwQsNpP X-Google-Smtp-Source: APiQypJ+BTahGIu304/Js9QByXFVGRtFVsq7vFTp3mwRAJBVMGUJwA4pZJ8kPVd5TdGz3sWcsiYY9A== X-Received: by 2002:a17:902:ea8b:: with SMTP id x11mr543871plb.205.1588275265748; Thu, 30 Apr 2020 12:34:25 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id d126sm494477pfc.81.2020.04.30.12.34.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 12:34:24 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 0CDC71A011E for ; Thu, 30 Apr 2020 12:34:24 -0700 (PDT) From: "H.J. Lu" To: libc-stable@sourceware.org Subject: [2.31/2.30] [PATCH 3/6] Add a syscall test for [BZ #25810] Date: Thu, 30 Apr 2020 12:34:20 -0700 Message-Id: <20200430193423.807713-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200430193423.807713-1-hjl.tools@gmail.com> References: <20200430193423.807713-1-hjl.tools@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-25.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 19:34:37 -0000 Add a test to pass 64-bit long arguments to syscall with undefined upper 32 bits on x32. Tested on i386, x86-64 and x32 as well as with build-many-glibcs.py. (cherry picked from commit 781dacc4f41332098e3a272514b20a490a7ebc8c) --- misc/Makefile | 2 +- misc/tst-syscalls.c | 167 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 misc/tst-syscalls.c diff --git a/misc/Makefile b/misc/Makefile index e0465980c7..e167e199eb 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -87,7 +87,7 @@ tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \ tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \ tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt \ - tst-mntent-autofs + tst-mntent-autofs tst-syscalls # Tests which need libdl. ifeq (yes,$(build-shared)) diff --git a/misc/tst-syscalls.c b/misc/tst-syscalls.c new file mode 100644 index 0000000000..cfcd382320 --- /dev/null +++ b/misc/tst-syscalls.c @@ -0,0 +1,167 @@ +/* Test for syscall interfaces. + Copyright (C) 2020 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 + . */ + +/* This test verifies that the x32 system call handling zero-extends + unsigned 32-bit arguments to the 64-bit argument registers for + system calls (bug 25810). The bug is specific to x32, but the test + should pass on all architectures. */ + +#include +#include +#include +#include +#include +#include + +/* On x32, this can be passed in a single 64-bit integer register. */ +struct Array +{ + size_t length; + void *ptr; +}; + +static int error_count; + +__attribute__ ((noclone, noinline)) +struct Array +allocate (size_t bytes) +{ + if (!bytes) + return __extension__ (struct Array) {0, 0}; + + void *p = mmap (0x0, bytes, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + if (p == MAP_FAILED) + return __extension__ (struct Array) {0, 0}; + + return __extension__ (struct Array) {bytes, p}; +} + +__attribute__ ((noclone, noinline)) +void +deallocate (struct Array b) +{ + /* On x32, the 64-bit integer register containing `b' may be copied + to another 64-bit integer register to pass the second argument to + munmap. */ + if (b.length && munmap (b.ptr, b.length)) + { + printf ("munmap error: %m\n"); + error_count++; + } +} + +__attribute__ ((noclone, noinline)) +void * +do_mmap (void *addr, size_t length) +{ + return mmap (addr, length, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); +} + +__attribute__ ((noclone, noinline)) +void * +reallocate (struct Array b) +{ + /* On x32, the 64-bit integer register containing `b' may be copied + to another 64-bit integer register to pass the second argument to + do_mmap. */ + if (b.length) + return do_mmap (b.ptr, b.length); + return NULL; +} + +__attribute__ ((noclone, noinline)) +void +protect (struct Array b) +{ + if (b.length) + { + /* On x32, the 64-bit integer register containing `b' may be copied + to another 64-bit integer register to pass the second argument + to mprotect. */ + if (mprotect (b.ptr, b.length, + PROT_READ | PROT_WRITE | PROT_EXEC)) + { + printf ("mprotect error: %m\n"); + error_count++; + } + } +} + +__attribute__ ((noclone, noinline)) +ssize_t +do_read (int fd, void *ptr, struct Array b) +{ + /* On x32, the 64-bit integer register containing `b' may be copied + to another 64-bit integer register to pass the second argument to + read. */ + if (b.length) + return read (fd, ptr, b.length); + return 0; +} + +__attribute__ ((noclone, noinline)) +ssize_t +do_write (int fd, void *ptr, struct Array b) +{ + /* On x32, the 64-bit integer register containing `b' may be copied + to another 64-bit integer register to pass the second argument to + write. */ + if (b.length) + return write (fd, ptr, b.length); + return 0; +} + +static int +do_test (void) +{ + struct Array array; + + array = allocate (1); + protect (array); + deallocate (array); + void *p = reallocate (array); + if (p == MAP_FAILED) + { + printf ("mmap error: %m\n"); + error_count++; + } + array.ptr = p; + protect (array); + deallocate (array); + + int fd = xopen ("/dev/null", O_RDWR, 0); + char buf[2]; + array.ptr = buf; + if (do_read (fd, array.ptr, array) == -1) + { + printf ("read error: %m\n"); + error_count++; + } + if (do_write (fd, array.ptr, array) == -1) + { + printf ("write error: %m\n"); + error_count++; + } + xclose (fd); + + return error_count ? EXIT_FAILURE : EXIT_SUCCESS; +} + +#include -- 2.26.2