From owner-svn-src-all@freebsd.org Thu Sep 27 18:32:15 2018 Return-Path: Delivered-To: svn-src-all@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 DA32610B533F; Thu, 27 Sep 2018 18:32:15 +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.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 90938705EB; Thu, 27 Sep 2018 18:32:15 +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 8B8CF1D67; Thu, 27 Sep 2018 18:32:15 +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 w8RIWFIp073581; Thu, 27 Sep 2018 18:32:15 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8RIWFxV073579; Thu, 27 Sep 2018 18:32:15 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201809271832.w8RIWFxV073579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 27 Sep 2018 18:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r338979 - in releng: 11.1/sys/kern 11.2/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.1/sys/kern 11.2/sys/kern X-SVN-Commit-Revision: 338979 X-SVN-Commit-Repository: base 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.27 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: Thu, 27 Sep 2018 18:32:16 -0000 Author: gordon Date: Thu Sep 27 18:32:14 2018 New Revision: 338979 URL: https://svnweb.freebsd.org/changeset/base/338979 Log: Fix NULL pointer dereference in freebsd4_getfsstat. [EN-18:10.syscall] Reported by: Thomas Barabosch, Fraunhofer FKIE Approved by: so Security: FreeBSD-EN-18:10.syscall Security: CVE-2018-17154 Modified: releng/11.1/sys/kern/vfs_syscalls.c releng/11.2/sys/kern/vfs_syscalls.c Modified: releng/11.1/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.1/sys/kern/vfs_syscalls.c Thu Sep 27 18:29:55 2018 (r338978) +++ releng/11.1/sys/kern/vfs_syscalls.c Thu Sep 27 18:32:14 2018 (r338979) @@ -641,6 +641,8 @@ freebsd4_getfsstat(td, uap) size = count * sizeof(struct statfs); error = kern_getfsstat(td, &buf, size, &count, UIO_SYSSPACE, uap->mode); + if (buf == NULL) + return (EINVAL); td->td_retval[0] = count; if (size != 0) { sp = buf; Modified: releng/11.2/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.2/sys/kern/vfs_syscalls.c Thu Sep 27 18:29:55 2018 (r338978) +++ releng/11.2/sys/kern/vfs_syscalls.c Thu Sep 27 18:32:14 2018 (r338979) @@ -600,6 +600,8 @@ freebsd4_getfsstat(struct thread *td, struct freebsd4_ size = count * sizeof(struct statfs); error = kern_getfsstat(td, &buf, size, &count, UIO_SYSSPACE, uap->mode); + if (buf == NULL) + return (EINVAL); td->td_retval[0] = count; if (size != 0) { sp = buf;