summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Wright <chrisw@osdl.org>2004-06-14 09:03:40 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-14 09:03:40 -0700
commit20f284b9b64cd23b3e9e1e045797887b197231f4 (patch)
tree9b34095bd7730d2512a0b7369dff8559ec333722 /include
parent5b2785a167df52499abd52accdcb3a4c9d74451c (diff)
[PATCH] __user annotation for shm_shmat hook declaration
Add proper __user annotation for shm_shmat hook in security.h. From: Mika Kukkonen <mika@osdl.org> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index df0089af8ad6..e2f166907ebb 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1172,7 +1172,7 @@ struct security_operations {
int (*shm_associate) (struct shmid_kernel * shp, int shmflg);
int (*shm_shmctl) (struct shmid_kernel * shp, int cmd);
int (*shm_shmat) (struct shmid_kernel * shp,
- char *shmaddr, int shmflg);
+ char __user *shmaddr, int shmflg);
int (*sem_alloc_security) (struct sem_array * sma);
void (*sem_free_security) (struct sem_array * sma);