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

Commit 1d62d737 authored by Felix Fietkau's avatar Felix Fietkau Committed by Ralf Baechle
Browse files

MIPS: Fix sched_getaffinity with MT FPAFF enabled 



p->thread.user_cpus_allowed is zero-initialized and is only filled on
the first sched_setaffinity call.

To avoid adding overhead in the task initialization codepath, simply OR
the returned mask in sched_getaffinity with p->cpus_allowed.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10740/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d3557d96

arch/mips/kernel/mips-mt-fpaff.c

+3 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 
				      unsigned long __user *user_mask_ptr)

{

	unsigned int real_len;

	cpumask_t mask;

	cpumask_t allowed, mask;

	int retval;

	struct task_struct *p;
@@ -173,7 +173,8 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 
	if (retval)

		goto out_unlock;



	cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask);

	cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed);

	cpumask_and(&mask, &allowed, cpu_active_mask);



out_unlock:

	read_unlock(&tasklist_lock);