From owner-svn-src-all@freebsd.org Mon Oct 19 20:22:19 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07880A19506; Mon, 19 Oct 2015 20:22:19 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B272A2A6; Mon, 19 Oct 2015 20:22:18 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JKMHAD033729; Mon, 19 Oct 2015 20:22:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JKMHjc033727; Mon, 19 Oct 2015 20:22:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201510192022.t9JKMHjc033727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 19 Oct 2015 20:22:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289603 - head/tests/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 20:22:19 -0000 Author: kib Date: Mon Oct 19 20:22:17 2015 New Revision: 289603 URL: https://svnweb.freebsd.org/changeset/base/289603 Log: Add tests for the copyin(9) handling of illegal buffers. Reviewed by: emaste, ngie Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D3925 Added: head/tests/sys/kern/kern_copyin.c (contents, props changed) Modified: head/tests/sys/kern/Makefile Modified: head/tests/sys/kern/Makefile ============================================================================== --- head/tests/sys/kern/Makefile Mon Oct 19 19:18:02 2015 (r289602) +++ head/tests/sys/kern/Makefile Mon Oct 19 20:22:17 2015 (r289603) @@ -2,6 +2,7 @@ TESTSDIR= ${TESTSBASE}/sys/kern +ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test ATF_TESTS_C+= ptrace_test ATF_TESTS_C+= unix_seqpacket_test Added: head/tests/sys/kern/kern_copyin.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/kern/kern_copyin.c Mon Oct 19 20:22:17 2015 (r289603) @@ -0,0 +1,86 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int scratch_file; + +static int +copyin_checker(uintptr_t uaddr, size_t len) +{ + ssize_t ret; + + ret = write(scratch_file, (const void *)uaddr, len); + return (ret == -1 ? errno : 0); +} + +#define FMAX ULONG_MAX + +ATF_TC_WITHOUT_HEAD(kern_copyin); +ATF_TC_BODY(kern_copyin, tc) +{ + char template[] = "copyin.XXXXXX"; + + scratch_file = mkstemp(template); + ATF_REQUIRE(scratch_file != -1); + unlink(template); + + ATF_CHECK(copyin_checker(0, 0) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 9) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 10) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 11) == EFAULT); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 1, 1) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 0) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 1) == EFAULT); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 2) == EFAULT); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 0) == 0); + ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 2) == EFAULT); + ATF_CHECK(copyin_checker(FMAX - 10, 9) == EFAULT); + ATF_CHECK(copyin_checker(FMAX - 10, 10) == EFAULT); + ATF_CHECK(copyin_checker(FMAX - 10, 11) == EFAULT); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, kern_copyin); + return (atf_no_error()); +}