svn commit: r283059 - head/sys/kern

Mateusz Guzik mjg at FreeBSD.org
Mon May 18 14:27:05 UTC 2015


Author: mjg
Date: Mon May 18 14:27:04 2015
New Revision: 283059
URL: https://svnweb.freebsd.org/changeset/base/283059

Log:
  fd: fix imbalanced fdp unlock in F_SETLK and F_GETLK
  
  MFC after:	3 days

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Mon May 18 13:43:33 2015	(r283058)
+++ head/sys/kern/kern_descrip.c	Mon May 18 14:27:04 2015	(r283059)
@@ -617,7 +617,6 @@ kern_fcntl(struct thread *td, int fd, in
 			if (foffset < 0 ||
 			    (flp->l_start > 0 &&
 			     foffset > OFF_MAX - flp->l_start)) {
-				FILEDESC_SUNLOCK(fdp);
 				error = EOVERFLOW;
 				fdrop(fp, td);
 				break;
@@ -731,7 +730,6 @@ kern_fcntl(struct thread *td, int fd, in
 			    foffset > OFF_MAX - flp->l_start) ||
 			    (flp->l_start < 0 &&
 			     foffset < OFF_MIN - flp->l_start)) {
-				FILEDESC_SUNLOCK(fdp);
 				error = EOVERFLOW;
 				fdrop(fp, td);
 				break;


More information about the svn-src-all mailing list