From owner-svn-src-releng@freebsd.org Thu Mar 19 16:48:30 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A98F2264100; Thu, 19 Mar 2020 16:48:30 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48jtC23Mx3z3RM0; Thu, 19 Mar 2020 16:48:30 +0000 (UTC) (envelope-from gordon@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 38BB6DF4B; Thu, 19 Mar 2020 16:48:30 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02JGmT2T024511; Thu, 19 Mar 2020 16:48:29 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02JGmT6p024507; Thu, 19 Mar 2020 16:48:29 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202003191648.02JGmT6p024507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 19 Mar 2020 16:48:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r359139 - in releng: 11.3/sys/dev/oce 12.1/sys/dev/oce X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/dev/oce 12.1/sys/dev/oce X-SVN-Commit-Revision: 359139 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2020 16:48:30 -0000 Author: gordon Date: Thu Mar 19 16:48:29 2020 New Revision: 359139 URL: https://svnweb.freebsd.org/changeset/base/359139 Log: Fix insufficient oce(4) ioctl(2) privilege checking. Approved by: so Security: FreeBSD-SA-20:05.if_oce_ioctl Security: CVE-2019-15876 Modified: releng/11.3/sys/dev/oce/oce_if.c releng/11.3/sys/dev/oce/oce_if.h releng/12.1/sys/dev/oce/oce_if.c releng/12.1/sys/dev/oce/oce_if.h Modified: releng/11.3/sys/dev/oce/oce_if.c ============================================================================== --- releng/11.3/sys/dev/oce/oce_if.c Thu Mar 19 16:46:01 2020 (r359138) +++ releng/11.3/sys/dev/oce/oce_if.c Thu Mar 19 16:48:29 2020 (r359139) @@ -616,6 +616,9 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d break; case SIOCGPRIVATE_0: + rc = priv_check(curthread, PRIV_DRIVER); + if (rc != 0) + break; rc = oce_handle_passthrough(ifp, data); break; default: Modified: releng/11.3/sys/dev/oce/oce_if.h ============================================================================== --- releng/11.3/sys/dev/oce/oce_if.h Thu Mar 19 16:46:01 2020 (r359138) +++ releng/11.3/sys/dev/oce/oce_if.h Thu Mar 19 16:48:29 2020 (r359139) @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include Modified: releng/12.1/sys/dev/oce/oce_if.c ============================================================================== --- releng/12.1/sys/dev/oce/oce_if.c Thu Mar 19 16:46:01 2020 (r359138) +++ releng/12.1/sys/dev/oce/oce_if.c Thu Mar 19 16:48:29 2020 (r359139) @@ -621,6 +621,9 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d break; case SIOCGPRIVATE_0: + rc = priv_check(curthread, PRIV_DRIVER); + if (rc != 0) + break; rc = oce_handle_passthrough(ifp, data); break; default: Modified: releng/12.1/sys/dev/oce/oce_if.h ============================================================================== --- releng/12.1/sys/dev/oce/oce_if.h Thu Mar 19 16:46:01 2020 (r359138) +++ releng/12.1/sys/dev/oce/oce_if.h Thu Mar 19 16:48:29 2020 (r359139) @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include