Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfdaf38 authored by Vitaliy Ivanov's avatar Vitaliy Ivanov Committed by Jiri Kosina
Browse files

futex: uninitialized warning corrections 



The variables here are really not used uninitialized.

kernel/futex.c: In function 'fixup_pi_state_owner.clone.17':
kernel/futex.c:1582:6: warning: 'curval' may be used uninitialized in this function
kernel/futex.c: In function 'handle_futex_death':
kernel/futex.c:2486:6: warning: 'nval' may be used uninitialized in this function
kernel/futex.c: In function 'do_futex':
kernel/futex.c:863:11: warning: 'curval' may be used uninitialized in this function
kernel/futex.c:828:6: note: 'curval' was declared here
kernel/futex.c:898:5: warning: 'oldval' may be used uninitialized in this function
kernel/futex.c:890:6: note: 'oldval' was declared here

Signed-off-by: default avatarVitaliy Ivanov <vitalivanov@gmail.com>
Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 124ff4e5

kernel/futex.c

+4 −4
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) 
{

	struct task_struct *new_owner;

	struct futex_pi_state *pi_state = this->pi_state;

	u32 curval, newval;

	u32 uninitialized_var(curval), newval;



	if (!pi_state)

		return -EINVAL;
@@ -887,7 +887,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) 


static int unlock_futex_pi(u32 __user *uaddr, u32 uval)

{

	u32 oldval;

	u32 uninitialized_var(oldval);



	/*

	 * There is no waiter, so we unlock the futex. The owner died
@@ -1546,7 +1546,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, 
	u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;

	struct futex_pi_state *pi_state = q->pi_state;

	struct task_struct *oldowner = pi_state->owner;

	u32 uval, curval, newval;

	u32 uval, uninitialized_var(curval), newval;

	int ret;



	/* Owner died? */
@@ -2451,7 +2451,7 @@ SYSCALL_DEFINE3(get_robust_list, int, pid, 
 */

int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)

{

	u32 uval, nval, mval;

	u32 uval, uninitialized_var(nval), mval;



retry:

	if (get_user(uval, uaddr))