From owner-svn-src-releng@freebsd.org  Mon Oct  7 15:26:40 2019
Return-Path: <owner-svn-src-releng@freebsd.org>
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 A81D4132358;
 Mon,  7 Oct 2019 15:26:40 +0000 (UTC)
 (envelope-from markj@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 46n48J40mTz49WR;
 Mon,  7 Oct 2019 15:26:40 +0000 (UTC)
 (envelope-from markj@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 6C984189F5;
 Mon,  7 Oct 2019 15:26:40 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x97FQefk006885;
 Mon, 7 Oct 2019 15:26:40 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x97FQeRc006884;
 Mon, 7 Oct 2019 15:26:40 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201910071526.x97FQeRc006884@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 7 Oct 2019 15:26:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r353279 - releng/12.1/sys/kern
X-SVN-Group: releng
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: releng/12.1/sys/kern
X-SVN-Commit-Revision: 353279
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 <svn-src-releng.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-releng>, 
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Oct 2019 15:26:40 -0000

Author: markj
Date: Mon Oct  7 15:26:40 2019
New Revision: 353279
URL: https://svnweb.freebsd.org/changeset/base/353279

Log:
  MFS r353276:
  Disallow fcntl(F_READAHEAD) when the vnode is not a regular file.
  
  Approved by:	re (gjb)

Modified:
  releng/12.1/sys/kern/kern_descrip.c
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/sys/kern/kern_descrip.c
==============================================================================
--- releng/12.1/sys/kern/kern_descrip.c	Mon Oct  7 15:25:00 2019	(r353278)
+++ releng/12.1/sys/kern/kern_descrip.c	Mon Oct  7 15:26:40 2019	(r353279)
@@ -770,6 +770,12 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_
 			break;
 		}
 		vp = fp->f_vnode;
+		if (vp->v_type != VREG) {
+			fdrop(fp, td);
+			error = ENOTTY;
+			break;
+		}
+
 		/*
 		 * Exclusive lock synchronizes against f_seqcount reads and
 		 * writes in sequential_heuristic().