From owner-svn-src-all@freebsd.org Wed Sep 2 16:22:14 2020 Return-Path: Delivered-To: svn-src-all@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 D09163DBD9B; Wed, 2 Sep 2020 16:22:14 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BhTjf5G2Hz3Sfq; Wed, 2 Sep 2020 16:22:14 +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 9909CD24C; Wed, 2 Sep 2020 16:22:14 +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 082GMEZ8036298; Wed, 2 Sep 2020 16:22:14 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GMEXj036002; Wed, 2 Sep 2020 16:22:14 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021622.082GMEXj036002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:22:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365254 - in releng: 11.3/sys/kern 11.4/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/kern 11.4/sys/kern X-SVN-Commit-Revision: 365254 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.33 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: Wed, 02 Sep 2020 16:22:14 -0000 Author: gordon Date: Wed Sep 2 16:22:14 2020 New Revision: 365254 URL: https://svnweb.freebsd.org/changeset/base/365254 Log: Fix getfsstat compatibility system call panic. Approved by: so Security: FreeBSD-EN-20:18.getfsstat Modified: releng/11.3/sys/kern/vfs_syscalls.c releng/11.4/sys/kern/vfs_syscalls.c Modified: releng/11.3/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.3/sys/kern/vfs_syscalls.c Wed Sep 2 16:21:27 2020 (r365253) +++ releng/11.3/sys/kern/vfs_syscalls.c Wed Sep 2 16:22:14 2020 (r365254) @@ -409,6 +409,8 @@ kern_getfsstat(struct thread *td, struct statfs **buf, case MNT_NOWAIT: break; default: + if (bufseg == UIO_SYSSPACE) + *buf = NULL; return (EINVAL); } restart: Modified: releng/11.4/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.4/sys/kern/vfs_syscalls.c Wed Sep 2 16:21:27 2020 (r365253) +++ releng/11.4/sys/kern/vfs_syscalls.c Wed Sep 2 16:22:14 2020 (r365254) @@ -409,6 +409,8 @@ kern_getfsstat(struct thread *td, struct statfs **buf, case MNT_NOWAIT: break; default: + if (bufseg == UIO_SYSSPACE) + *buf = NULL; return (EINVAL); } restart: