1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index f7921360efad..7e52eb051f22 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
        if (fetch_robust_entry(&upending, &pending,
                               &head->list_op_pending, &pip))
                return;
-        if (upending)
+        if (pending)
                handle_futex_death((void __user *)pending + futex_offset, curr, pip);
-        while (compat_ptr(uentry) != &head->list) {
+        while (entry != (struct robust_list __user *) &head->list) {
                /*
                 * A pending lock might already be on the list, so
                 * dont process it twice:

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index f7921360efad..7e52eb051f22 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
61	if (fetch_robust_entry(&upending, &pending,	61	if (fetch_robust_entry(&upending, &pending,
62	&head->list_op_pending, &pip))	62	&head->list_op_pending, &pip))
63	return;	63	return;
64	if (upending)	64	if (pending)
65	handle_futex_death((void __user *)pending + futex_offset, curr, pip);	65	handle_futex_death((void __user *)pending + futex_offset, curr, pip);
66		66
67	while (compat_ptr(uentry) != &head->list) {	67	while (entry != (struct robust_list __user *) &head->list) {
68	/*	68	/*
69	* A pending lock might already be on the list, so	69	* A pending lock might already be on the list, so
70	* dont process it twice:	70	* dont process it twice: