diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 17:33:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 17:33:32 +1100 |
| commit | b894d099e1cc413305d5a1649816701ec291538d (patch) | |
| tree | 570196112e04fa091b87be4ba0b84fcb250de53f /drivers/connector/cn_proc.c | |
| parent | fc2985800d164066d9fd4ab2334bea6380d4472d (diff) | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
Merge commit 'security-testing/next'
Conflicts:
fs/cifs/cifs_fs_sb.h
fs/nfsd/nfs4recover.c
fs/ocfs2/namei.c
Diffstat (limited to 'drivers/connector/cn_proc.c')
| -rw-r--r-- | drivers/connector/cn_proc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 5c9f67f98d10..c5afc98e2675 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -106,6 +106,7 @@ void proc_id_connector(struct task_struct *task, int which_id) struct proc_event *ev; __u8 buffer[CN_PROC_MSG_SIZE]; struct timespec ts; + const struct cred *cred; if (atomic_read(&proc_event_num_listeners) < 1) return; @@ -115,14 +116,19 @@ void proc_id_connector(struct task_struct *task, int which_id) ev->what = which_id; ev->event_data.id.process_pid = task->pid; ev->event_data.id.process_tgid = task->tgid; + rcu_read_lock(); + cred = __task_cred(task); if (which_id == PROC_EVENT_UID) { - ev->event_data.id.r.ruid = task->uid; - ev->event_data.id.e.euid = task->euid; + ev->event_data.id.r.ruid = cred->uid; + ev->event_data.id.e.euid = cred->euid; } else if (which_id == PROC_EVENT_GID) { - ev->event_data.id.r.rgid = task->gid; - ev->event_data.id.e.egid = task->egid; - } else + ev->event_data.id.r.rgid = cred->gid; + ev->event_data.id.e.egid = cred->egid; + } else { + rcu_read_unlock(); return; + } + rcu_read_unlock(); get_seq(&msg->seq, &ev->cpu); ktime_get_ts(&ts); /* get high res monotonic timestamp */ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); |