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

Commit 40525ee6 authored by Ganesh Mahendran's avatar Ganesh Mahendran Committed by Amit Pundir
Browse files

ANDROID: uid_sys_stats: fix access of task_uid(task) 



struct task_struct *task should be proteced by tasklist_lock.

Change-Id: Iefcd13442a9b9d855a2bbcde9fd838a4132fee58
Signed-off-by: default avatarGanesh Mahendran <opensource.ganesh@gmail.com>
(cherry picked from commit 90d78776c4a0e13fb7ee5bd0787f04a1730631a6)
parent ce533d7c

drivers/misc/uid_sys_stats.c

+5 −4
Original line number Diff line number Diff line
@@ -96,9 +96,11 @@ static int uid_cputime_show(struct seq_file *m, void *v) 
{

	struct uid_entry *uid_entry;

	struct task_struct *task, *temp;

	struct user_namespace *user_ns = current_user_ns();

	u64 utime;

	u64 stime;

	unsigned long bkt;

	uid_t uid;



	rt_mutex_lock(&uid_lock);
@@ -109,14 +111,13 @@ static int uid_cputime_show(struct seq_file *m, void *v) 


	read_lock(&tasklist_lock);

	do_each_thread(temp, task) {

		uid_entry = find_or_register_uid(from_kuid_munged(

			current_user_ns(), task_uid(task)));

		uid = from_kuid_munged(user_ns, task_uid(task));

		uid_entry = find_or_register_uid(uid);

		if (!uid_entry) {

			read_unlock(&tasklist_lock);

			rt_mutex_unlock(&uid_lock);

			pr_err("%s: failed to find the uid_entry for uid %d\n",

				__func__, from_kuid_munged(current_user_ns(),

				task_uid(task)));

				__func__, uid);

			return -ENOMEM;

		}

		task_cputime_adjusted(task, &utime, &stime);