From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:30:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B71841065675; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 590F81065673 for ; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44CCB8FC22 for ; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNU3Qj061314 for ; Thu, 29 Jan 2009 23:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNU3bZ061312 for perforce@freebsd.org; Thu, 29 Jan 2009 23:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:30:03 GMT Message-Id: <200901292330.n0TNU3bZ061312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2009 23:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156893 Change 156893 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:30:00 Test CAP_MAPEXEC with PROT_EXEC in mmap/capability regression test. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,9 +30,9 @@ */ #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#2 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 $"); -#include +#include #include #include #include @@ -181,6 +181,20 @@ } } + p = mmap(NULL, getpagesize(), PROT_EXEC, MAP_SHARED, fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_MAPEXEC)) == (CAP_MMAP | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap mapexec failed error %d", + rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap mapexec succeeded", rights); + (void)munmap(p, getpagesize()); + } + } + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_SHARED, fd_cap, 0); if ((rights & (CAP_MMAP | CAP_READ | CAP_WRITE)) == (CAP_MMAP | @@ -198,6 +212,57 @@ } } + p = mmap(NULL, getpagesize(), PROT_READ | PROT_EXEC, MAP_SHARED, + fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_READ | CAP_MAPEXEC)) == (CAP_MMAP | + CAP_READ | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap read|mapexec failed error %d", + rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap read|mapexec succeeded", + rights); + (void)munmap(p, getpagesize()); + } + } + + p = mmap(NULL, getpagesize(), PROT_EXEC | PROT_WRITE, MAP_SHARED, + fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_MAPEXEC | CAP_WRITE)) == (CAP_MMAP | + CAP_MAPEXEC | CAP_WRITE)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap mapexec|write failed " + "error %d", rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap mapexec|write succeeded", + rights); + (void)munmap(p, getpagesize()); + } + } + + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_SHARED, fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC)) == + (CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap read|write|mapexec failed " + "error %d", rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap read|write|mapexec " + "succeeded", rights); + (void)munmap(p, getpagesize()); + } + } + /* XXX fcntl */ /* XXX select / poll / kqueue */ @@ -316,7 +381,11 @@ try_file_ops(fd, CAP_MMAP); try_file_ops(fd, CAP_MMAP | CAP_READ); try_file_ops(fd, CAP_MMAP | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_MAPEXEC); try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_MAPEXEC); + try_file_ops(fd, CAP_MMAP | CAP_MAPEXEC | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC); try_file_ops(fd, CAP_FCNTL); try_file_ops(fd, CAP_EVENT); try_file_ops(fd, CAP_FSYNC);