From patchwork Wed Jun 19 14:13:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 167241 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp787531ilk; Wed, 19 Jun 2019 07:13:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqXdgFSCNPSezl+yxS/2QpcLMtv7nMxK7wH+izaoY6lBDfJ9py6A846j+n4rZv3P8MQScV X-Received: by 2002:a17:902:6b02:: with SMTP id o2mr25081426plk.133.1560953626278; Wed, 19 Jun 2019 07:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560953626; cv=none; d=google.com; s=arc-20160816; b=PpVugJP3SzSxDsYHQ9glDxjUU52i+xEO7ZuS/FLvXiV3+CNJicJWca2tCwCXEUX7yt ttIJ85KHmxkHVWJ5OqSKkWvH9FOsAID/qywcO0+BKZNk06oZL9oKNszvF/UBQb0/1O0u Yxb3GYNIjMijqQdFzI2xcS3uMt3B3Md6P6cJehU1XImN38iCPGEUOaNaUax16LfA4Ubx SmtLnsj9Azu41d2+RTfyG6+v+QVyvWT874j6e7b8TyM1cyuf6nhRx4wm1gWFctcFSetF mTP2M3iKNCtNam/KhHbpIfFxXv6YPaSqedacA0pENlvz7zCPxLdU/4imM1oUohU1cqGc 3UPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=IG22lms6iFsxhQxsV+CYS4Dqavwu3/sUwWgqPDbyhKE=; b=QpfT76FJlLLQe7auVPu8Ecvi5kQA4XbZxtSVf5GA84iSO2ADsX1GbIXXGseqzYwbsc IHeqzHBqx3Nbi2dqB7eaYUneSuQNx8Ss1oZJWAghzYts68trF5nVqKyloqX2D+908CoD 0h4ImtNLK3Iq94VJ/2hjadXV/H2KXwFRBJMGBFT9TZF2wvR/6h1Y5diJQM5GMP3QjRLQ +hZpcnaIGPlpJU9G4y8O7rA198+m9S04c6874jEcSDbDY5ry25UhAhn4i423kOQwk68s JNG7o35+/z5gSCBHgsGw0dz5ZnQE3YWdRlHr3CXmOKV0EyfsbXlEUGw2i69FpbcFd4kD Jg+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=BGW2SCui; dkim=pass header.i=@linaro.org header.s=google header.b=qx40sDKM; spf=pass (google.com: domain of libc-alpha-return-102842-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102842-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id u1si16466897plb.234.2019.06.19.07.13.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2019 07:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-102842-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=BGW2SCui; dkim=pass header.i=@linaro.org header.s=google header.b=qx40sDKM; spf=pass (google.com: domain of libc-alpha-return-102842-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102842-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=tf81fScG/QpANlzp854uLrqkEEWIeWQlFQiIjLApfyTxV4/NjswvN vD6/A7mnhsj47qHgZRptxXyhzbwcSnBsWlpqyXbFuXQu2heQqcZac/QYp3QefOS1 DDID/IjqCvCdrd1xMqSx2AgOYvwHc8q0l0VTSMde5bCjg2dTMNkPRA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=kgWpflZGvzxBUM7IjeuF0r9uxc4=; b=BGW2SCuid9+I/cRyCVgxYAkZsIow QM1HHG5CV2U5PBSt5il27AxC5+qJL6vkBi6ebdGsf7kZ0JyH0P5W1H7ivk2SmZtl zhAsbObOCaU8PKsy/k4dHgMJglXKe09ryZEKS2LKiXEVPI6le63w25yzXZAALRpC 8bniMg0q9Ji1P7I= Received: (qmail 114873 invoked by alias); 19 Jun 2019 14:13:37 -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 114863 invoked by uid 89); 19 Jun 2019 14:13:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=2318 X-HELO: mail-vk1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=IG22lms6iFsxhQxsV+CYS4Dqavwu3/sUwWgqPDbyhKE=; b=qx40sDKMFUEG3XE7dEWHLOaKmj8Hj/rHdXmsL5vjlLsT/MiTmFoJU9PjBMRJPiexWV 52IMduYU6djUMoMQ+4ptOCE97QRblFQd3G6vCcPXVBWpo7t4Yubg2G5nop5o8W/5mfQb LTH1UYvDoxWrreoDlqy4bEzfpyL5OBkLVEeTLEFCIliE+PKipqA3vdJsM8PwgJ/6IRm0 cNKFtpXU8R+7SjU4sTkNJzo/cmjIu8dBds/t2Z0sMDIWrxvaPUri6eKJY6cYG+oUcULJ YyUmVGPay/em0WVcIceychcxLxFn5g4+aonLiHQZeYQ+O2JDnnPGcXKZGBe6aHgIIqBt GWgw== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Thomas De Schampheleire Subject: [PATCH] posix: Fix large mmap64 offset for mips64n32 (BZ#24699) Date: Wed, 19 Jun 2019 11:13:28 -0300 Message-Id: <20190619141328.27185-1-adhemerval.zanella@linaro.org> The fix for BZ#21270 (commit 158d5fa0e19) added a mask to avoid offset larger than 1^44 to be used along __NR_mmap2. However mips64n32 users __NR_mmap, as mips64n64, but still defines off_t as old non-LFS type (other ILP32, such x32, defines off_t being equal to off64_t). This leads to use the same mask meant only for __NR_mmap2 call for __NR_mmap, thus limiting the maximum offset it can use with mmap64. This patch fixes by setting the high mask only for __NR_mmap2 usage. The posix/tst-mmap-offset.c already tests it and also fails for mips64n32. The patch also change the test to check for an arch-specific header that defines the maximum supported offset. Checked on x86_64-linux-gnu, i686-linux-gnu, and I also tests tst-mmap-offset on qemu simulated mips64 with kernel 3.2.0 kernel for both mips-linux-gnu and mips64-n32-linux-gnu. [BZ #24699] * posix/tst-mmap-offset.c: Mention BZ #24699. (do_test_bz21270): Rename to do_test_large_offset and use mmap64_maximum_offset to check for maximum expected offset value. * sysdeps/generic/mmap_info.h: New file. * sysdeps/unix/sysv/linux/mips/mmap_info.h: Likewise. * sysdeps/unix/sysv/linux/mmap64.c (MMAP_OFF_HIGH_MASK): Define iff __NR_mmap2 is used. --- posix/tst-mmap-offset.c | 9 +++++---- sysdeps/generic/mmap_info.h | 16 ++++++++++++++++ sysdeps/unix/sysv/linux/mips/mmap_info.h | 13 +++++++++++++ sysdeps/unix/sysv/linux/mmap64.c | 9 ++++++++- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 sysdeps/generic/mmap_info.h create mode 100644 sysdeps/unix/sysv/linux/mips/mmap_info.h -- 2.17.1 diff --git a/posix/tst-mmap-offset.c b/posix/tst-mmap-offset.c index 676c52845f..d4e53c3e67 100644 --- a/posix/tst-mmap-offset.c +++ b/posix/tst-mmap-offset.c @@ -1,4 +1,4 @@ -/* BZ #18877 and #21270 mmap offset test. +/* BZ #18877, BZ #21270, and BZ #24699 mmap offset test. Copyright (C) 2015-2019 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -76,7 +77,7 @@ do_test_bz18877 (void) /* Check if invalid offset are handled correctly by mmap. */ static int -do_test_bz21270 (void) +do_test_large_offset (void) { /* For architectures with sizeof (off_t) < sizeof (off64_t) mmap is implemented with __SYS_mmap2 syscall and the offset is represented in @@ -90,7 +91,7 @@ do_test_bz21270 (void) const size_t length = 4096; void *addr = mmap64 (NULL, length, prot, flags, fd, offset); - if (sizeof (off_t) < sizeof (off64_t)) + if (mmap64_maximum_offset (page_shift) < UINT64_MAX) { if ((addr != MAP_FAILED) && (errno != EINVAL)) FAIL_RET ("mmap succeed"); @@ -110,7 +111,7 @@ do_test (void) int ret = 0; ret += do_test_bz18877 (); - ret += do_test_bz21270 (); + ret += do_test_large_offset (); return ret; } diff --git a/sysdeps/generic/mmap_info.h b/sysdeps/generic/mmap_info.h new file mode 100644 index 0000000000..9a3315a8fe --- /dev/null +++ b/sysdeps/generic/mmap_info.h @@ -0,0 +1,16 @@ +/* As default architectures with sizeof (off_t) < sizeof (off64_t) the mmap is + implemented with __SYS_mmap2 syscall and the offset is represented in + multiples of page size. For offset larger than + '1 << (page_shift + 8 * sizeof (off_t))' (that is, 1<<44 on system with + page size of 4096 bytes) the system call silently truncates the offset. + For this case, glibc mmap implementation returns EINVAL. */ + +/* Return the maximum value expected as offset argument in mmap64 call. */ +uint64_t static inline +mmap64_maximum_offset (long int page_shift) +{ + if (sizeof (off_t) < sizeof (off64_t)) + return (UINT64_C(1) << (page_shift + (8 * sizeof (off_t)))) - 1; + else + return UINT64_MAX; +} diff --git a/sysdeps/unix/sysv/linux/mips/mmap_info.h b/sysdeps/unix/sysv/linux/mips/mmap_info.h new file mode 100644 index 0000000000..6fd3c3d954 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mmap_info.h @@ -0,0 +1,13 @@ +/* mips64n32 uses __NR_mmap for mmap64 while still having sizeof (off_t) + smaller than sizeof (off64_t). So it allows mapping large offsets + using mmap64 than 32-bit archs which uses __NR_mmap2. */ + +uint64_t static inline +mmap64_maximum_offset (long int page_shift) +{ +#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64 + return UINT64_MAX; +#else + return (UINT64_C(1) << (page_shift + (8 * sizeof (off_t)))) - 1; +#endif +} diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index cb56540119..671db2b654 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -23,11 +23,18 @@ #include #include +#ifdef __NR_mmap2 /* To avoid silent truncation of offset when using mmap2, do not accept offset larger than 1 << (page_shift + off_t bits). For archictures with 32 bits off_t and page size of 4096 it would be 1^44. */ -#define MMAP_OFF_HIGH_MASK \ +# define MMAP_OFF_HIGH_MASK \ ((-(MMAP2_PAGE_UNIT << 1) << (8 * sizeof (off_t) - 1))) +#else +/* Some ABIs might use __NR_mmap while having sizeof (off_t) smaller than + sizeof (off64_t) (currently only MIPS64n32). For this case just set + zero the higher bits so mmap with large offset does not fail. */ +# define MMAP_OFF_HIGH_MASK 0x0 +#endif #define MMAP_OFF_MASK (MMAP_OFF_HIGH_MASK | MMAP_OFF_LOW_MASK)