aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/cn_proc.h
diff options
context:
space:
mode:
authorMatt Helsley <matthltc@us.ibm.com>2005-11-29 19:34:31 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-29 19:47:03 -0800
commitdf69a60dc6afc2936d79054d30b481c1fd9720e5 (patch)
tree9f64f677964ae214dd6654947c553d8416720049 /include/linux/cn_proc.h
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-dev-df69a60dc6afc2936d79054d30b481c1fd9720e5.tar.xz
linux-dev-df69a60dc6afc2936d79054d30b481c1fd9720e5.zip
[PATCH] process events connector: uid_t gid_t size issues
The uid_t and gid_t fields appear to present a 32/64-bit userspace/kernel problem for some archs. This patch addresses the problem by fixing the size to the largest size for uid_t/gid_t used in the kernel. This preserves the total size of the event structure while ensuring that the layouts of the ID change event match in 32 and 64-bit kernels and applications. Signed-off-by: Matt Helsley <matthltc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/cn_proc.h')
-rw-r--r--include/linux/cn_proc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index 70ab56317380..c948f678e04e 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -86,12 +86,12 @@ struct proc_event {
pid_t process_pid;
pid_t process_tgid;
union {
- uid_t ruid; /* current->uid */
- gid_t rgid; /* current->gid */
+ __u32 ruid; /* task uid */
+ __u32 rgid; /* task gid */
} r;
union {
- uid_t euid;
- gid_t egid;
+ __u32 euid;
+ __u32 egid;
} e;
} id;