From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2066) id 56BAC3898524; Wed, 10 Jun 2020 03:36:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 56BAC3898524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1591760210; bh=9pkecguUQH2DuTg7Q5XpTh8YFeL5tqpN3fsyfNGk5nE=; h=From:To:Subject:Date:From; b=m+gIUnSPzIEBbKiuJe+2gtEm1j/ZWeo3yuGVTREOMsMNxn7mNpXeOqCCoDAAeEZgr +EoEbUKVlUptM1lOiuGLdCz/mQRGe63fYZWa6vvtfRG73B5oknk9xBz/Ib2uCGg9tv KleH7lbPwZlgocSpx0V6dkIjiTi+RoW6HrgSR0Hg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jiu Fu Guo To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/guojiufu/heads/personal-branch)] [OpenACC] Missing unlocking on error paths in attach/detach code, part II X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/users/guojiufu/heads/personal-branch X-Git-Oldrev: dc9541545d9e5705a97c41713c557f55522b54dc X-Git-Newrev: 2e24d457d8c97e409549848715ff046cfa9efd3d Message-Id: <20200610033650.56BAC3898524@sourceware.org> Date: Wed, 10 Jun 2020 03:36:50 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 03:36:50 -0000 https://gcc.gnu.org/g:2e24d457d8c97e409549848715ff046cfa9efd3d commit 2e24d457d8c97e409549848715ff046cfa9efd3d Author: Thomas Schwinge Date: Sat May 23 17:20:30 2020 +0200 [OpenACC] Missing unlocking on error paths in attach/detach code, part II libgomp/ * oacc-mem.c (goacc_exit_data_internal): Unlock on error path. Diff: --- libgomp/oacc-mem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c index c06b7341cbb..6713846c942 100644 --- a/libgomp/oacc-mem.c +++ b/libgomp/oacc-mem.c @@ -1060,7 +1060,10 @@ goacc_exit_data_internal (struct gomp_device_descr *acc_dev, size_t mapnum, = splay_tree_lookup (&acc_dev->mem_map, &cur_node); if (n == NULL) - gomp_fatal ("struct not mapped for detach operation"); + { + gomp_mutex_unlock (&acc_dev->lock); + gomp_fatal ("struct not mapped for detach operation"); + } gomp_detach_pointer (acc_dev, aq, n, hostaddr, finalize, NULL); }