From owner-svn-src-head@freebsd.org Tue Mar 24 17:35:27 2020 Return-Path: Delivered-To: svn-src-head@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 4795D262CC5; Tue, 24 Mar 2020 17:35:27 +0000 (UTC) (envelope-from kib@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 48mz0t0gDPz41XK; Tue, 24 Mar 2020 17:35:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34DC6308E; Tue, 24 Mar 2020 17:16:53 +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 02OHGrH4067138; Tue, 24 Mar 2020 17:16:53 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02OHGrq9067137; Tue, 24 Mar 2020 17:16:53 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003241716.02OHGrq9067137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 24 Mar 2020 17:16:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359272 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 359272 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.29 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: Tue, 24 Mar 2020 17:35:27 -0000 Author: kib Date: Tue Mar 24 17:16:52 2020 New Revision: 359272 URL: https://svnweb.freebsd.org/changeset/base/359272 Log: kern_copy_file_range(): check the file type. The syscall can only operate on valid vnode types. Reported and tested by: pho Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/vfs_syscalls.c Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Tue Mar 24 12:27:02 2020 (r359271) +++ head/sys/kern/vfs_syscalls.c Tue Mar 24 17:16:52 2020 (r359272) @@ -4735,9 +4735,25 @@ kern_copy_file_range(struct thread *td, int infd, off_ error = fget_read(td, infd, &cap_read_rights, &infp); if (error != 0) goto out; + if (infp->f_ops == &badfileops) { + error = EBADF; + goto out; + } + if (infp->f_vnode == NULL) { + error = EINVAL; + goto out; + } error = fget_write(td, outfd, &cap_write_rights, &outfp); if (error != 0) goto out; + if (outfp->f_ops == &badfileops) { + error = EBADF; + goto out; + } + if (outfp->f_vnode == NULL) { + error = EINVAL; + goto out; + } /* Set the offset pointers to the correct place. */ if (inoffp == NULL)