diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-01-14 08:14:29 -0500 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-01-14 08:15:29 -0500 |
| commit | 1e7bfb2134dfec37ce04fb3a4ca89299e892d10c (patch) | |
| tree | 99c676262e696754dcbfb2d6f59499972cd0c38c /security | |
| parent | c4ea37c26a691ad0b7e86aa5884aab27830e95c9 (diff) | |
[CVE-2009-0029] System call wrappers part 27
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/keyctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 09796797d122..070a53eab80f 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
| @@ -54,11 +54,11 @@ static int key_get_type_from_user(char *type, | |||
| 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, | |||
| 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; |
