git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
[safe/jmp/linux-2.6]
/
kernel
/
uid16.c
diff --git
a/kernel/uid16.c
b/kernel/uid16.c
index
2460c31
..
4192098
100644
(file)
--- a/
kernel/uid16.c
+++ b/
kernel/uid16.c
@@
-4,7
+4,6
@@
*/
#include <linux/mm.h>
*/
#include <linux/mm.h>
-#include <linux/utsname.h>
#include <linux/mman.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/mman.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
@@
-17,7
+16,7
@@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-
asmlinkage long sys_chown16(const char __user * filename, old_uid_t user, old_gid_t
group)
+
SYSCALL_DEFINE3(chown16, const char __user *, filename, old_uid_t, user, old_gid_t,
group)
{
long ret = sys_chown(filename, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_chown(filename, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
@@
-25,7
+24,7
@@
asmlinkage long sys_chown16(const char __user * filename, old_uid_t user, old_gi
return ret;
}
return ret;
}
-
asmlinkage long sys_lchown16(const char __user * filename, old_uid_t user, old_gid_t
group)
+
SYSCALL_DEFINE3(lchown16, const char __user *, filename, old_uid_t, user, old_gid_t,
group)
{
long ret = sys_lchown(filename, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_lchown(filename, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
@@
-33,7
+32,7
@@
asmlinkage long sys_lchown16(const char __user * filename, old_uid_t user, old_g
return ret;
}
return ret;
}
-
asmlinkage long sys_fchown16(unsigned int fd, old_uid_t user, old_gid_t
group)
+
SYSCALL_DEFINE3(fchown16, unsigned int, fd, old_uid_t, user, old_gid_t,
group)
{
long ret = sys_fchown(fd, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_fchown(fd, low2highuid(user), low2highgid(group));
/* avoid REGPARM breakage on x86: */
@@
-41,7
+40,7
@@
asmlinkage long sys_fchown16(unsigned int fd, old_uid_t user, old_gid_t group)
return ret;
}
return ret;
}
-
asmlinkage long sys_setregid16(old_gid_t rgid, old_gid_t
egid)
+
SYSCALL_DEFINE2(setregid16, old_gid_t, rgid, old_gid_t,
egid)
{
long ret = sys_setregid(low2highgid(rgid), low2highgid(egid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setregid(low2highgid(rgid), low2highgid(egid));
/* avoid REGPARM breakage on x86: */
@@
-49,7
+48,7
@@
asmlinkage long sys_setregid16(old_gid_t rgid, old_gid_t egid)
return ret;
}
return ret;
}
-
asmlinkage long sys_setgid16(old_gid_t
gid)
+
SYSCALL_DEFINE1(setgid16, old_gid_t,
gid)
{
long ret = sys_setgid(low2highgid(gid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setgid(low2highgid(gid));
/* avoid REGPARM breakage on x86: */
@@
-57,7
+56,7
@@
asmlinkage long sys_setgid16(old_gid_t gid)
return ret;
}
return ret;
}
-
asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t
euid)
+
SYSCALL_DEFINE2(setreuid16, old_uid_t, ruid, old_uid_t,
euid)
{
long ret = sys_setreuid(low2highuid(ruid), low2highuid(euid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setreuid(low2highuid(ruid), low2highuid(euid));
/* avoid REGPARM breakage on x86: */
@@
-65,7
+64,7
@@
asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t euid)
return ret;
}
return ret;
}
-
asmlinkage long sys_setuid16(old_uid_t
uid)
+
SYSCALL_DEFINE1(setuid16, old_uid_t,
uid)
{
long ret = sys_setuid(low2highuid(uid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setuid(low2highuid(uid));
/* avoid REGPARM breakage on x86: */
@@
-73,7
+72,7
@@
asmlinkage long sys_setuid16(old_uid_t uid)
return ret;
}
return ret;
}
-
asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t
suid)
+
SYSCALL_DEFINE3(setresuid16, old_uid_t, ruid, old_uid_t, euid, old_uid_t,
suid)
{
long ret = sys_setresuid(low2highuid(ruid), low2highuid(euid),
low2highuid(suid));
{
long ret = sys_setresuid(low2highuid(ruid), low2highuid(euid),
low2highuid(suid));
@@
-82,7
+81,7
@@
asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t suid)
return ret;
}
return ret;
}
-
asmlinkage long sys_getresuid16(old_uid_t __user *ruid, old_uid_t __user *euid, old_uid_t __user *
suid)
+
SYSCALL_DEFINE3(getresuid16, old_uid_t __user *, ruid, old_uid_t __user *, euid, old_uid_t __user *,
suid)
{
const struct cred *cred = current_cred();
int retval;
{
const struct cred *cred = current_cred();
int retval;
@@
-94,7
+93,7
@@
asmlinkage long sys_getresuid16(old_uid_t __user *ruid, old_uid_t __user *euid,
return retval;
}
return retval;
}
-
asmlinkage long sys_setresgid16(old_gid_t rgid, old_gid_t egid, old_gid_t
sgid)
+
SYSCALL_DEFINE3(setresgid16, old_gid_t, rgid, old_gid_t, egid, old_gid_t,
sgid)
{
long ret = sys_setresgid(low2highgid(rgid), low2highgid(egid),
low2highgid(sgid));
{
long ret = sys_setresgid(low2highgid(rgid), low2highgid(egid),
low2highgid(sgid));
@@
-103,7
+102,8
@@
asmlinkage long sys_setresgid16(old_gid_t rgid, old_gid_t egid, old_gid_t sgid)
return ret;
}
return ret;
}
-asmlinkage long sys_getresgid16(old_gid_t __user *rgid, old_gid_t __user *egid, old_gid_t __user *sgid)
+
+SYSCALL_DEFINE3(getresgid16, old_gid_t __user *, rgid, old_gid_t __user *, egid, old_gid_t __user *, sgid)
{
const struct cred *cred = current_cred();
int retval;
{
const struct cred *cred = current_cred();
int retval;
@@
-115,7
+115,7
@@
asmlinkage long sys_getresgid16(old_gid_t __user *rgid, old_gid_t __user *egid,
return retval;
}
return retval;
}
-
asmlinkage long sys_setfsuid16(old_uid_t
uid)
+
SYSCALL_DEFINE1(setfsuid16, old_uid_t,
uid)
{
long ret = sys_setfsuid(low2highuid(uid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setfsuid(low2highuid(uid));
/* avoid REGPARM breakage on x86: */
@@
-123,7
+123,7
@@
asmlinkage long sys_setfsuid16(old_uid_t uid)
return ret;
}
return ret;
}
-
asmlinkage long sys_setfsgid16(old_gid_t
gid)
+
SYSCALL_DEFINE1(setfsgid16, old_gid_t,
gid)
{
long ret = sys_setfsgid(low2highgid(gid));
/* avoid REGPARM breakage on x86: */
{
long ret = sys_setfsgid(low2highgid(gid));
/* avoid REGPARM breakage on x86: */
@@
-161,7
+161,7
@@
static int groups16_from_user(struct group_info *group_info,
return 0;
}
return 0;
}
-
asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *
grouplist)
+
SYSCALL_DEFINE2(getgroups16, int, gidsetsize, old_gid_t __user *,
grouplist)
{
const struct cred *cred = current_cred();
int i;
{
const struct cred *cred = current_cred();
int i;
@@
-184,7
+184,7
@@
out:
return i;
}
return i;
}
-
asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *
grouplist)
+
SYSCALL_DEFINE2(setgroups16, int, gidsetsize, old_gid_t __user *,
grouplist)
{
struct group_info *group_info;
int retval;
{
struct group_info *group_info;
int retval;
@@
-209,22
+209,22
@@
asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist)
return retval;
}
return retval;
}
-
asmlinkage long sys_getuid16(void
)
+
SYSCALL_DEFINE0(getuid16
)
{
return high2lowuid(current_uid());
}
{
return high2lowuid(current_uid());
}
-
asmlinkage long sys_geteuid16(void
)
+
SYSCALL_DEFINE0(geteuid16
)
{
return high2lowuid(current_euid());
}
{
return high2lowuid(current_euid());
}
-
asmlinkage long sys_getgid16(void
)
+
SYSCALL_DEFINE0(getgid16
)
{
return high2lowgid(current_gid());
}
{
return high2lowgid(current_gid());
}
-
asmlinkage long sys_getegid16(void
)
+
SYSCALL_DEFINE0(getegid16
)
{
return high2lowgid(current_egid());
}
{
return high2lowgid(current_egid());
}