Skip to contentSkip to conversation

core/urgent fix

GIT PULL Ingo Molnar 1 participant 1 message Aug 12, 2013

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

HEAD: 85f4896123d0299128f2c95cc40f3b8b01d4b0f6 mutex: Fix w/w mutex deadlock injection

A w/w mutex fixlet.

Thanks,

Ingo

------------------>
Maarten Lankhorst (1):
mutex: Fix w/w mutex deadlock injection

 kernel/mutex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/mutex.c +2 -2
index ff05f4b..a52ee7bb 100644
@@ -686,7 +686,7 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 	might_sleep();
 	ret =  __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE,
 				   0, &ctx->dep_map, _RET_IP_, ctx);
-	if (!ret && ctx->acquired > 0)
+	if (!ret && ctx->acquired > 1)
 		return ww_mutex_deadlock_injection(lock, ctx);
 
 	return ret;
@@ -702,7 +702,7 @@ __ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 	ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE,
 				  0, &ctx->dep_map, _RET_IP_, ctx);
 
-	if (!ret && ctx->acquired > 0)
+	if (!ret && ctx->acquired > 1)
 		return ww_mutex_deadlock_injection(lock, ctx);
 
 	return ret;