From patchwork Mon Nov 16 09:46:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Stancek X-Patchwork-Id: 7625631 X-Patchwork-Delegate: paul@paul-moore.com Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4A129F1C2 for ; Mon, 16 Nov 2015 13:25:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D1709205BE for ; Mon, 16 Nov 2015 13:25:11 +0000 (UTC) Received: from emvm-gh1-uea08.nsa.gov (emvm-gh1-uea08.nsa.gov [63.239.67.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C10D62057E for ; Mon, 16 Nov 2015 13:25:10 +0000 (UTC) X-TM-IMSS-Message-ID: <2c56dfcc00042ec7@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([63.239.67.9]) with ESMTP (TREND IMSS SMTP Service 7.1) id 2c56dfcc00042ec7 ; Mon, 16 Nov 2015 08:23:25 -0500 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id tAGDLd90014710; Mon, 16 Nov 2015 08:22:02 -0500 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id tAG9kjMO000613 for ; Mon, 16 Nov 2015 04:46:46 -0500 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id tAG9kjHO031588; Mon, 16 Nov 2015 04:46:45 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1BtBQB+pUlW/xy3hNFeGQEBAQEPAQEBAYMLgUK8O4QMhhACgTNMAQEBAQEBhUABAQR5EFEtKhmILrleAQEII4ZUiSZ/hBIFh0GHDId7jSePLI0ZY4IRHRaBQXGEAYFKAQEB X-IPAS-Result: A1BtBQB+pUlW/xy3hNFeGQEBAQEPAQEBAYMLgUK8O4QMhhACgTNMAQEBAQEBhUABAQR5EFEtKhmILrleAQEII4ZUiSZ/hBIFh0GHDId7jSePLI0ZY4IRHRaBQXGEAYFKAQEB X-IronPort-AV: E=Sophos;i="5.20,302,1444708800"; d="scan'208";a="4934478" Received: from emvm-gh1-uea09.nsa.gov ([63.239.67.10]) by goalie.tycho.ncsc.mil with ESMTP; 16 Nov 2015 04:46:33 -0500 X-TM-IMSS-Message-ID: <2b897a520003efab@nsa.gov> Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by nsa.gov ([63.239.67.10]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 ADH-AES256-SHA (256/256)) id 2b897a520003efab ; Mon, 16 Nov 2015 04:47:50 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id B011896FA; Mon, 16 Nov 2015 09:46:31 +0000 (UTC) Received: from dustball.brq.redhat.com (dustball.brq.redhat.com [10.34.26.57]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAG9kTqH009695; Mon, 16 Nov 2015 04:46:30 -0500 From: Jan Stancek To: selinux@tycho.nsa.gov Subject: [selinux-testsuite PATCH v2 3/4] mmap/mprotect_heap: make sure memory is allocated from heap Date: Mon, 16 Nov 2015 10:46:26 +0100 Message-Id: In-Reply-To: <53398a996e0230fa07c82955624a474524bee50b.1446805443.git.jstancek@redhat.com> References: <53398a996e0230fa07c82955624a474524bee50b.1446805443.git.jstancek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-TM-AS-MML: disable X-Mailman-Approved-At: Mon, 16 Nov 2015 08:21:37 -0500 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Cc: sds@tycho.nsa.gov, jstancek@redhat.com MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This test failed on ppc64 with 64k pagesize because memory allocation used mmap() instead of advancing heap. Use mallopt(M_MMAP_THRESHOLD,..) with large enough value to discourage use of mmap(). Also set length in mprotect to pagesize, kernel silently aligns it to pagesize anyway. Signed-off-by: Jan Stancek Cc: Paul Moore Cc: Stephen Smalley --- tests/mmap/mprotect_heap.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/mmap/mprotect_heap.c b/tests/mmap/mprotect_heap.c index 691299493c3f..23de4de5be62 100644 --- a/tests/mmap/mprotect_heap.c +++ b/tests/mmap/mprotect_heap.c @@ -3,6 +3,11 @@ #include #include #include +#include + +#ifndef DEFAULT_MMAP_THRESHOLD_MAX +#define DEFAULT_MMAP_THRESHOLD_MAX 512*1024 +#endif int main(void) { @@ -10,13 +15,19 @@ int main(void) int rc; int pagesize = getpagesize(); + rc = mallopt(M_MMAP_THRESHOLD, DEFAULT_MMAP_THRESHOLD_MAX); + if (rc != 1) { + fprintf(stderr, "mallopt failed: %d\n", rc); + exit(1); + } + rc = posix_memalign(&ptr, pagesize, pagesize); if (rc) { fprintf(stderr, "posix_memalign failed: %d\n", rc); exit(1); } - rc = mprotect(ptr, 4096, PROT_READ | PROT_EXEC); + rc = mprotect(ptr, pagesize, PROT_READ | PROT_EXEC); if (rc < 0) { perror("mprotect"); exit(1);