diff options
| author | Julian Brown <julian@codesourcery.com> | 2021-09-24 04:18:40 -0700 |
|---|---|---|
| committer | Julian Brown <julian@codesourcery.com> | 2021-10-12 06:50:26 -0700 |
| commit | ccfcf08e66c741a1b24a7851a530cf47aa5e704f (patch) | |
| tree | 7ab008adc7639be45cd75be98fef523e4ad388c7 | |
| parent | d1dcaa31453fa080a27938b064e53f02272d4aa1 (diff) | |
| download | gcc-ccfcf08e66c741a1b24a7851a530cf47aa5e704f.zip gcc-ccfcf08e66c741a1b24a7851a530cf47aa5e704f.tar.gz gcc-ccfcf08e66c741a1b24a7851a530cf47aa5e704f.tar.bz2 | |
libgomp: Release device lock on cbuf error path
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.
| -rw-r--r-- | libgomp/target.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index 67fcf41..196dba4 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -385,7 +385,10 @@ gomp_copy_host2dev (struct gomp_device_descr *devicep, else if (cbuf->chunks[middle].start <= doff) { 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), h, sz); return; |