[CVE-2009-0029] System call wrappers part 27

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

[CVE-2009-0029] System call wrappers part 27
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Heiko Carstens
1 parent c4ea37c26a
Showing 8 changed files with 18 additions and 18 deletions Side-by-side Diff
fs/exec.c
fs/filesystems.c
fs/nfsctl.c
kernel/printk.c
kernel/ptrace.c
kernel/sysctl.c
kernel/timer.c
security/keys/keyctl.c
@@ -99,7 +99,7 @@
  *
  * Also note that we take the address to load from from the file itself.
  */
-asmlinkage long sys_uselib(const char __user * library)
+SYSCALL_DEFINE1(uselib, const char __user *, library)
 {
 	struct file *file;
 	struct nameidata nd;
@@ -179,7 +179,7 @@
 /*
  * Whee.. Weird sysv syscall. 
  */
-asmlinkage long sys_sysfs(int option, unsigned long arg1, unsigned long arg2)
+SYSCALL_DEFINE3(sysfs, int, option, unsigned long, arg1, unsigned long, arg2)
 {
 	int retval = -EINVAL;
  
@@ -86,8 +86,8 @@
 	},
 };
  
-long
-asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user *arg, void __user *res)
+SYSCALL_DEFINE3(nfsservctl, int, cmd, struct nfsctl_arg __user *, arg,
+		void __user *, res)
 {
 	struct file *file;
 	void __user *p = &arg->u;
@@ -382,7 +382,7 @@
 	return error;
 }
  
-asmlinkage long sys_syslog(int type, char __user *buf, int len)
+SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
 {
 	return do_syslog(type, buf, len);
 }
@@ -574,7 +574,7 @@
 #define arch_ptrace_attach(child)	do { } while (0)
 #endif
  
-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
+SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
 {
 	struct task_struct *child;
 	long ret;
@@ -1688,7 +1688,7 @@
 	return error;
 }
  
-asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
+SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
 {
 	struct __sysctl_args tmp;
 	int error;
@@ -2989,7 +2989,7 @@
 #else /* CONFIG_SYSCTL_SYSCALL */
  
  
-asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
+SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
 {
 	struct __sysctl_args tmp;
 	int error;
@@ -1400,7 +1400,7 @@
 	return 0;
 }
  
-asmlinkage long sys_sysinfo(struct sysinfo __user *info)
+SYSCALL_DEFINE1(sysinfo, struct sysinfo __user *, info)
 {
 	struct sysinfo val;
  
@@ -54,11 +54,11 @@
  * - returns the new key's serial number
  * - implements add_key()
  */
-asmlinkage long sys_add_key(const char __user *_type,
-			    const char __user *_description,
-			    const void __user *_payload,
-			    size_t plen,
-			    key_serial_t ringid)
+SYSCALL_DEFINE5(add_key, const char __user *, _type,
+		const char __user *, _description,
+		const void __user *, _payload,
+		size_t, plen,
+		key_serial_t, ringid)
 {
 	key_ref_t keyring_ref, key_ref;
 	char type[32], *description;
@@ -146,10 +146,10 @@
  *   - if the _callout_info string is empty, it will be rendered as "-"
  * - implements request_key()
  */
-asmlinkage long sys_request_key(const char __user *_type,
-				const char __user *_description,
-				const char __user *_callout_info,
-				key_serial_t destringid)
+SYSCALL_DEFINE4(request_key, const char __user *, _type,
+		const char __user *, _description,
+		const char __user *, _callout_info,
+		key_serial_t, destringid)
 {
 	struct key_type *ktype;
 	struct key *key;
...	...	@@ -99,7 +99,7 @@
99	99	*
100	100	* Also note that we take the address to load from from the file itself.
101	101	*/
102		-asmlinkage long sys_uselib(const char __user * library)
	102	+SYSCALL_DEFINE1(uselib, const char __user *, library)
103	103	{
104	104	struct file *file;
105	105	struct nameidata nd;
...	...	@@ -179,7 +179,7 @@
179	179	/*
180	180	* Whee.. Weird sysv syscall.
181	181	*/
182		-asmlinkage long sys_sysfs(int option, unsigned long arg1, unsigned long arg2)
	182	+SYSCALL_DEFINE3(sysfs, int, option, unsigned long, arg1, unsigned long, arg2)
183	183	{
184	184	int retval = -EINVAL;
185	185
...	...	@@ -86,8 +86,8 @@
86	86	},
87	87	};
88	88
89		-long
90		-asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user arg, void __user res)
	89	+SYSCALL_DEFINE3(nfsservctl, int, cmd, struct nfsctl_arg __user *, arg,
	90	+ void __user *, res)
91	91	{
92	92	struct file *file;
93	93	void __user *p = &arg->u;
...	...	@@ -382,7 +382,7 @@
382	382	return error;
383	383	}
384	384
385		-asmlinkage long sys_syslog(int type, char __user *buf, int len)
	385	+SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
386	386	{
387	387	return do_syslog(type, buf, len);
388	388	}
...	...	@@ -574,7 +574,7 @@
574	574	#define arch_ptrace_attach(child) do { } while (0)
575	575	#endif
576	576
577		-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
	577	+SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
578	578	{
579	579	struct task_struct *child;
580	580	long ret;
...	...	@@ -1688,7 +1688,7 @@
1688	1688	return error;
1689	1689	}
1690	1690
1691		-asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
	1691	+SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
1692	1692	{
1693	1693	struct __sysctl_args tmp;
1694	1694	int error;
...	...	@@ -2989,7 +2989,7 @@
2989	2989	#else /* CONFIG_SYSCTL_SYSCALL */
2990	2990
2991	2991
2992		-asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
	2992	+SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
2993	2993	{
2994	2994	struct __sysctl_args tmp;
2995	2995	int error;
...	...	@@ -1400,7 +1400,7 @@
1400	1400	return 0;
1401	1401	}
1402	1402
1403		-asmlinkage long sys_sysinfo(struct sysinfo __user *info)
	1403	+SYSCALL_DEFINE1(sysinfo, struct sysinfo __user *, info)
1404	1404	{
1405	1405	struct sysinfo val;
1406	1406
...	...	@@ -54,11 +54,11 @@
54	54	* - returns the new key's serial number
55	55	* - implements add_key()
56	56	*/
57		-asmlinkage long sys_add_key(const char __user *_type,
58		- const char __user *_description,
59		- const void __user *_payload,
60		- size_t plen,
61		- key_serial_t ringid)
	57	+SYSCALL_DEFINE5(add_key, const char __user *, _type,
	58	+ const char __user *, _description,
	59	+ const void __user *, _payload,
	60	+ size_t, plen,
	61	+ key_serial_t, ringid)
62	62	{
63	63	key_ref_t keyring_ref, key_ref;
64	64	char type[32], *description;
...	...	@@ -146,10 +146,10 @@
146	146	* - if the _callout_info string is empty, it will be rendered as "-"
147	147	* - implements request_key()
148	148	*/
149		-asmlinkage long sys_request_key(const char __user *_type,
150		- const char __user *_description,
151		- const char __user *_callout_info,
152		- key_serial_t destringid)
	149	+SYSCALL_DEFINE4(request_key, const char __user *, _type,
	150	+ const char __user *, _description,
	151	+ const char __user *, _callout_info,
	152	+ key_serial_t, destringid)
153	153	{
154	154	struct key_type *ktype;
155	155	struct key *key;