From owner-svn-src-head@freebsd.org Wed Jun 20 00:55:20 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DB6F101A001; Wed, 20 Jun 2018 00:55:20 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D36937EA01; Wed, 20 Jun 2018 00:55:19 +0000 (UTC) (envelope-from stevek@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B119C1B3F9; Wed, 20 Jun 2018 00:55:19 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5K0tJ4n044761; Wed, 20 Jun 2018 00:55:19 GMT (envelope-from stevek@FreeBSD.org) Received: (from stevek@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5K0tIKZ044758; Wed, 20 Jun 2018 00:55:18 GMT (envelope-from stevek@FreeBSD.org) Message-Id: <201806200055.w5K0tIKZ044758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stevek set sender to stevek@FreeBSD.org using -f From: "Stephen J. Kiernan" Date: Wed, 20 Jun 2018 00:55:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335401 - head/lib/libveriexec X-SVN-Group: head X-SVN-Commit-Author: stevek X-SVN-Commit-Paths: head/lib/libveriexec X-SVN-Commit-Revision: 335401 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jun 2018 00:55:20 -0000 Author: stevek Date: Wed Jun 20 00:55:18 2018 New Revision: 335401 URL: https://svnweb.freebsd.org/changeset/base/335401 Log: This library allows for user space applications to check file descriptors or paths to see if they can be verified by MAC/veriexec. Reviewed by: jtl, wblock Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D8562 Added: head/lib/libveriexec/ head/lib/libveriexec/Makefile (contents, props changed) head/lib/libveriexec/libveriexec.h (contents, props changed) head/lib/libveriexec/veriexec.3 (contents, props changed) head/lib/libveriexec/veriexec_check.c (contents, props changed) Added: head/lib/libveriexec/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libveriexec/Makefile Wed Jun 20 00:55:18 2018 (r335401) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +.include + +LIB= veriexec +MAN= veriexec.3 +INCS= libveriexec.h + +WARNS?= 2 + +SRCS= veriexec_check.c + +.include + Added: head/lib/libveriexec/libveriexec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libveriexec/libveriexec.h Wed Jun 20 00:55:18 2018 (r335401) @@ -0,0 +1,37 @@ +/* + * $FreeBSD$ + * + * Copyright (c) 2011, 2012, 2013, 2015, Juniper Networks, Inc. + * All rights reserved. + * + * 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 ``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 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. + */ + +#ifndef __LIBVERIEXEC_H__ +#define __LIBVERIEXEC_H__ + +int veriexec_check_fd_mode(int, unsigned int); +int veriexec_check_path_mode(const char *, unsigned int); +int veriexec_check_fd(int); +int veriexec_check_path(const char *); + +#endif /* __LIBVERIEXEC_H__ */ Added: head/lib/libveriexec/veriexec.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libveriexec/veriexec.3 Wed Jun 20 00:55:18 2018 (r335401) @@ -0,0 +1,65 @@ +.\" Copyright (c) 2018, Juniper Networks, Inc. +.\" All rights reserved. +.\" +.\" 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. +.\" +.\" $FreeBSD$ +.\" +.Dd June 19, 2018 +.Dt VERIEXEC 3 +.Os +.Sh NAME +.Nm veriexec_check_fd , +.Nm veriexec_check_path +.Nd Verified execution routines +.Sh LIBRARY +.Lb libveriexec +.Sh SYNOPSIS +.In libveriexec.h +.Ft int +.Fn veriexec_check_fd "int fd" +.Ft int +.Fn veriexec_check_path "const char *file" +.Sh DESCRIPTION +The +.Fn veriexec_check_fd +function checks the signature of the file represented by the +.Fa fd +file descriptor. +.Pp +The +.Fn veriexec_check_path +function checks the signature of the file path +.Fa file . +.Pp +The +.Fn veriexec_check_fd +and +.Fn veriexec_check_path +functions return zero on a successful signature match or if veriexec is not +enabled. +If the signature does not match, +.Va errno +is set to the reason for the mismatch. +.Sh SEE ALSO +.Xr mac_veriexec 4 +.Xr veriexec 4 Added: head/lib/libveriexec/veriexec_check.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libveriexec/veriexec_check.c Wed Jun 20 00:55:18 2018 (r335401) @@ -0,0 +1,146 @@ +/* + * $FreeBSD$ + * + * Copyright (c) 2011, 2012, 2013, 2015, Juniper Networks, Inc. + * All rights reserved. + * + * 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 ``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 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 +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "libveriexec.h" + + +static int +check_fd_mode(int fd, unsigned int mask) +{ + struct stat st; + + if (fstat(fd, &st) < 0) + return errno; + + if ((st.st_mode & mask) == 0) + return EAUTH; + + return 0; +} + +int +veriexec_check_fd_mode(int fd, unsigned int mask) +{ + int error; + + if (fd < 0) { + errno = EINVAL; + return -1; + } + + error = mac_syscall(MAC_VERIEXEC_NAME, MAC_VERIEXEC_CHECK_FD_SYSCALL, + (void *)(intptr_t)fd); + if (error == -1) { + switch (errno) { + case ENOSYS: /* veriexec not loaded */ + error = 0; /* ignore */ + break; + } + } + if (mask && error == 0) + error = check_fd_mode(fd, mask); + + return (error); +} + +int +veriexec_check_path_mode(const char *file, unsigned int mask) +{ + int error; + + if (!file) { + errno = EINVAL; + return -1; + } + + if (mask) { + int fd; + + if ((fd = open(file, O_RDONLY)) < 0) + return errno; + + error = veriexec_check_fd_mode(fd, mask); + close(fd); + return error; + } + + error = mac_syscall(MAC_VERIEXEC_NAME, MAC_VERIEXEC_CHECK_PATH_SYSCALL, + __DECONST(void *, file)); + if (error == -1) { + switch (errno) { + case ENOSYS: /* veriexec not loaded */ + error = 0; /* ignore */ + break; + } + } + return (error); +} + +int +veriexec_check_fd(int fd) +{ + return veriexec_check_fd_mode(fd, 0); +} + +int +veriexec_check_path(const char *file) +{ + return veriexec_check_path_mode(file, 0); +} + +#if defined(MAIN) || defined(UNIT_TEST) +int +main(int argc __unused, char *argv[] __unused) +{ + int error; + int rc = 0; + + while (*++argv) { + error = veriexec_check_path(*argv); + if (error == -1) { + rc = 1; + warn("%s", *argv); + } + } + exit(rc); +} +#endif