OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libgomp: Release device lock on cbuf error path

Browse Source 
This patch releases the device lock on a sanity-checking error path in
transfer combining (cbuf) handling in libgomp:target.c.  This shouldn't
happen when handling well-formed mapping clauses, but erroneous clauses
can currently cause a hang if the condition triggers.

2021-12-10  Julian Brown  <julian@codesourcery.com>

libgomp/
	* target.c (gomp_copy_host2dev): Release device lock on cbuf
	error path.
This commit is contained in:
Julian Brown 2021-09-24 04:18:40 -07:00
parent d1dcaa3145
commit ccfcf08e66
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgomp/target.c
View File

@ -385,7 +385,10 @@ gomp_copy_host2dev (struct gomp_device_descr *devicep,
else if (cbuf->chunks[middle].start <= doff) else if (cbuf->chunks[middle].start <= doff)
{ {
if (doff + sz > cbuf->chunks[middle].end) if (doff + sz > cbuf->chunks[middle].end)
gomp_fatal ("internal libgomp cbuf error"); {
gomp_mutex_unlock (&devicep->lock);
gomp_fatal ("internal libgomp cbuf error");
}
memcpy ((char *) cbuf->buf + (doff - cbuf->chunks[0].start), memcpy ((char *) cbuf->buf + (doff - cbuf->chunks[0].start),
h, sz); h, sz);
return; return;