Page MenuHomeFreeBSD
Files F167313088

D43144.id131628.diff
No OneTemporary
Actions

D43144.id131628.diff
View Options

diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -2960,7 +2960,15 @@
*/
error = fueword32(&cv->c_has_waiters, &hasw);
if (error == 0 && hasw == 0)
- suword32(&cv->c_has_waiters, 1);
+ error = suword32(&cv->c_has_waiters, 1);
+ if (error != 0) {
+ umtxq_lock(&uq->uq_key);
+ umtxq_remove(uq);
+ umtxq_unbusy(&uq->uq_key);
+ umtxq_unlock(&uq->uq_key);
+ umtx_key_release(&uq->uq_key);
+ return (EFAULT);
+ }
umtxq_unbusy_unlocked(&uq->uq_key);
@@ -2990,7 +2998,9 @@
umtxq_remove(uq);
if (oldlen == 1) {
umtxq_unlock(&uq->uq_key);
- suword32(&cv->c_has_waiters, 0);
+ if (suword32(&cv->c_has_waiters, 0) != 0 &&
+ error == 0)
+ error = EFAULT;
umtxq_lock(&uq->uq_key);
}
}
@@ -3176,12 +3186,14 @@
*/
rv = fueword32(&rwlock->rw_blocked_readers,
&blocked_readers);
+ if (rv == 0)
+ rv = suword32(&rwlock->rw_blocked_readers,
+ blocked_readers + 1);
if (rv == -1) {
umtxq_unbusy_unlocked(&uq->uq_key);
error = EFAULT;
break;
}
- suword32(&rwlock->rw_blocked_readers, blocked_readers+1);
while (state & wrflags) {
umtxq_lock(&uq->uq_key);
@@ -3206,12 +3218,14 @@
/* decrease read waiter count, and may clear read contention bit */
rv = fueword32(&rwlock->rw_blocked_readers,
&blocked_readers);
+ if (rv == 0)
+ rv = suword32(&rwlock->rw_blocked_readers,
+ blocked_readers - 1);
if (rv == -1) {
umtxq_unbusy_unlocked(&uq->uq_key);
error = EFAULT;
break;
}
- suword32(&rwlock->rw_blocked_readers, blocked_readers-1);
if (blocked_readers == 1) {
rv = fueword32(&rwlock->rw_state, &state);
if (rv == -1) {
@@ -3360,12 +3374,14 @@
sleep:
rv = fueword32(&rwlock->rw_blocked_writers,
&blocked_writers);
+ if (rv == 0)
+ rv = suword32(&rwlock->rw_blocked_writers,
+ blocked_writers + 1);
if (rv == -1) {
umtxq_unbusy_unlocked(&uq->uq_key);
error = EFAULT;
break;
}
- suword32(&rwlock->rw_blocked_writers, blocked_writers + 1);
while ((state & URWLOCK_WRITE_OWNER) ||
URWLOCK_READER_COUNT(state) != 0) {
@@ -3390,12 +3406,14 @@
rv = fueword32(&rwlock->rw_blocked_writers,
&blocked_writers);
+ if (rv == 0)
+ rv = suword32(&rwlock->rw_blocked_writers,
+ blocked_writers - 1);
if (rv == -1) {
umtxq_unbusy_unlocked(&uq->uq_key);
error = EFAULT;
break;
}
- suword32(&rwlock->rw_blocked_writers, blocked_writers-1);
if (blocked_writers == 1) {
rv = fueword32(&rwlock->rw_state, &state);
if (rv == -1) {
@@ -3574,7 +3592,7 @@
rv1 = fueword32(&sem->_count, &count);
if (rv == -1 || rv1 == -1 || count != 0 || (rv == 1 && count1 == 0)) {
if (rv == 0)
- suword32(&sem->_has_waiters, 0);
+ rv = suword32(&sem->_has_waiters, 0);
umtxq_lock(&uq->uq_key);
umtxq_unbusy(&uq->uq_key);
umtxq_remove(uq);

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 21, 8:37 PM (2 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37053076
Default Alt Text
D43144.id131628.diff (2 KB)

Event Timeline