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

Commit 0c9dc102 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Use after free from pid_nr_ns()"

parents 8c3934fc 5cbee2fa

include/linux/pid.h

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ enum pid_type 
	PIDTYPE_PID,

	PIDTYPE_PGID,

	PIDTYPE_SID,

	PIDTYPE_MAX

	PIDTYPE_MAX,

	/* only valid to __task_pid_nr_ns() */

	__PIDTYPE_TGID

};



/*

include/linux/sched.h

+11 −8
Original line number Diff line number Diff line
@@ -2107,15 +2107,8 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk) 
	return tsk->tgid;

}



pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);



static inline pid_t task_tgid_vnr(struct task_struct *tsk)

{

	return pid_vnr(task_tgid(tsk));

}





static inline int pid_alive(const struct task_struct *p);

static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);

static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)

{

	pid_t pid = 0;
@@ -2156,6 +2149,16 @@ static inline pid_t task_session_vnr(struct task_struct *tsk) 
	return __task_pid_nr_ns(tsk, PIDTYPE_SID, NULL);

}



static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)

{

	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, ns);

}



static inline pid_t task_tgid_vnr(struct task_struct *tsk)

{

	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, NULL);

}



/* obsolete, do not use */

static inline pid_t task_pgrp_nr(struct task_struct *tsk)

{

kernel/pid.c

+4 −7
Original line number Diff line number Diff line
@@ -526,8 +526,11 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, 
	if (!ns)

		ns = task_active_pid_ns(current);

	if (likely(pid_alive(task))) {

		if (type != PIDTYPE_PID)

		if (type != PIDTYPE_PID) {

			if (type == __PIDTYPE_TGID)

				type = PIDTYPE_PID;

			task = task->group_leader;

		}

		nr = pid_nr_ns(rcu_dereference(task->pids[type].pid), ns);

	}

	rcu_read_unlock();
@@ -536,12 +539,6 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, 
}

EXPORT_SYMBOL(__task_pid_nr_ns);



pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)

{

	return pid_nr_ns(task_tgid(tsk), ns);

}

EXPORT_SYMBOL(task_tgid_nr_ns);



struct pid_namespace *task_active_pid_ns(struct task_struct *tsk)

{

	return ns_of_pid(task_pid(tsk));