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

Heiko Carstens committed 17 years ago

Commit 1e7bfb21 parent c4ea37c8 files · +18 −18Browse files

Unified · Split

8 files

@@ -99,7 +99,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt) · 98 unmodified lines
99	*	99	*
100	* Also note that we take the address to load from from the file itself.	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	struct file *file;	104	struct file *file;
105	struct nameidata nd;	105	struct nameidata nd;

@@ -179,7 +179,7 @@ static int fs_maxindex(void) · 178 unmodified lines
179	/*	179	/*
180	* Whee.. Weird sysv syscall.	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	int retval = -EINVAL;	184	int retval = -EINVAL;
185		185

@@ -86,8 +86,8 @@ static struct { · 85 unmodified lines
86	},	86	},
87	};	87	};
88		88
89	long	89	SYSCALL_DEFINE3(nfsservctl, int, cmd, struct nfsctl_arg __user *, arg,
90	asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user arg, void __user res)	90	void __user *, res)
91	{	91	{
92	struct file *file;	92	struct file *file;
93	void __user *p = &arg->u;	93	void __user *p = &arg->u;

@@ -382,7 +382,7 @@ out: · 381 unmodified lines
382	return error;	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	return do_syslog(type, buf, len);	387	return do_syslog(type, buf, len);
388	}	388	}

@@ -574,7 +574,7 @@ struct task_struct *ptrace_get_task_struct(pid_t pid) · 573 unmodified lines
574	#define arch_ptrace_attach(child) do { } while (0)	574	#define arch_ptrace_attach(child) do { } while (0)
575	#endif	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	struct task_struct *child;	579	struct task_struct *child;
580	long ret;	580	long ret;

@@ -1688,7 +1688,7 @@ int do_sysctl(int __user name, int nlen, void __user oldval, size_t __user *ol · 1687 unmodified lines
1688	return error;	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	struct __sysctl_args tmp;	1693	struct __sysctl_args tmp;
1694	int error;	1694	int error;
@@ -2989,7 +2989,7 @@ int sysctl_ms_jiffies(struct ctl_table *table, · 1294 unmodified lines
2989	#else /* CONFIG_SYSCTL_SYSCALL */	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	struct __sysctl_args tmp;	2994	struct __sysctl_args tmp;
2995	int error;	2995	int error;

@@ -1400,7 +1400,7 @@ out: · 1399 unmodified lines
1400	return 0;	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	struct sysinfo val;	1405	struct sysinfo val;
1406		1406

@@ -54,11 +54,11 @@ static int key_get_type_from_user(char *type, · 53 unmodified lines
54	* - returns the new key's serial number	54	* - returns the new key's serial number
55	* - implements add_key()	55	* - implements add_key()
56	*/	56	*/
57	asmlinkage long sys_add_key(const char __user *_type,	57	SYSCALL_DEFINE5(add_key, const char __user *, _type,
58	const char __user *_description,	58	const char __user *, _description,
59	const void __user *_payload,	59	const void __user *, _payload,
60	size_t plen,	60	size_t, plen,
61	key_serial_t ringid)	61	key_serial_t, ringid)
62	{	62	{
63	key_ref_t keyring_ref, key_ref;	63	key_ref_t keyring_ref, key_ref;
64	char type[32], *description;	64	char type[32], *description;
@@ -146,10 +146,10 @@ asmlinkage long sys_add_key(const char __user *_type, · 81 unmodified lines
146	* - if the _callout_info string is empty, it will be rendered as "-"	146	* - if the _callout_info string is empty, it will be rendered as "-"
147	* - implements request_key()	147	* - implements request_key()
148	*/	148	*/
149	asmlinkage long sys_request_key(const char __user *_type,	149	SYSCALL_DEFINE4(request_key, const char __user *, _type,
150	const char __user *_description,	150	const char __user *, _description,
151	const char __user *_callout_info,	151	const char __user *, _callout_info,
152	key_serial_t destringid)	152	key_serial_t, destringid)
153	{	153	{
154	struct key_type *ktype;	154	struct key_type *ktype;
155	struct key *key;	155	struct key *key;