From owner-svn-src-all@FreeBSD.ORG Mon May 18 14:27:05 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CFCA51A; Mon, 18 May 2015 14:27:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C2971F6D; Mon, 18 May 2015 14:27:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IER4Q9029343; Mon, 18 May 2015 14:27:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IER4Xj029342; Mon, 18 May 2015 14:27:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201505181427.t4IER4Xj029342@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 18 May 2015 14:27:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283059 - head/sys/kern X-SVN-Group: head 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.20 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: Mon, 18 May 2015 14:27:05 -0000 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;