svn commit: r292989 - head/sys/compat/linuxkpi/common/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Thu Dec 31 14:47:45 2015
New Revision: 292989
URL: https://svnweb.freebsd.org/changeset/base/292989

Log:
  Handle when filedescriptors are closed before initialized. An early
  fdclose() call can cause fget_unlocked() to fail.
  
  Found by:	mjg @
  MFC after:	1 week
  Reviewed by:	Mark Block <markb at mellanox.com>
  Sponsored by:	Mellanox Technologies
  Differential Revision:	https://reviews.freebsd.org/D4351

Modified:
  head/sys/compat/linuxkpi/common/include/linux/file.h

Modified: head/sys/compat/linuxkpi/common/include/linux/file.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/file.h	Thu Dec 31 14:39:45 2015	(r292988)
+++ head/sys/compat/linuxkpi/common/include/linux/file.h	Thu Dec 31 14:47:45 2015	(r292989)
@@ -101,10 +101,11 @@ fd_install(unsigned int fd, struct linux
 
 	if (fget_unlocked(curthread->td_proc->p_fd, fd,
 	    cap_rights_init(&rights), &file, NULL) != 0) {
-		file = NULL;
+		filp->_file = NULL;
+	} else {
+		filp->_file = file;
+		finit(file, filp->f_mode, DTYPE_DEV, filp, &linuxfileops);
 	}
-	filp->_file = file;
-	finit(file, filp->f_mode, DTYPE_DEV, filp, &linuxfileops);
 
 	/* drop the extra reference */
 	fput(filp);