Blame view
kernel/compat.c
29.5 KB
1da177e4c Linux-2.6.12-rc2 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
/* * linux/kernel/compat.c * * Kernel compatibililty routines for e.g. 32 bit syscall support * on 64 bit kernels. * * Copyright (C) 2002-2003 Stephen Rothwell, IBM Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ #include <linux/linkage.h> #include <linux/compat.h> #include <linux/errno.h> #include <linux/time.h> #include <linux/signal.h> #include <linux/sched.h> /* for MAX_SCHEDULE_TIMEOUT */ |
1da177e4c Linux-2.6.12-rc2 |
20 21 22 |
#include <linux/syscalls.h> #include <linux/unistd.h> #include <linux/security.h> |
3158e9411 [PATCH] consolida... |
23 |
#include <linux/timex.h> |
6e5fdeedc kernel: Fix files... |
24 |
#include <linux/export.h> |
1b2db9fb7 [PATCH] sys_move_... |
25 |
#include <linux/migrate.h> |
1711ef386 [PATCH] posix-tim... |
26 |
#include <linux/posix-timers.h> |
f06febc96 timers: fix itime... |
27 |
#include <linux/times.h> |
e3d5a27d5 Allow times and t... |
28 |
#include <linux/ptrace.h> |
5a0e3ad6a include cleanup: ... |
29 |
#include <linux/gfp.h> |
1da177e4c Linux-2.6.12-rc2 |
30 31 |
#include <asm/uaccess.h> |
1da177e4c Linux-2.6.12-rc2 |
32 |
|
65f5d80bd time: Splitout co... |
33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 |
static int compat_get_timex(struct timex *txc, struct compat_timex __user *utp) { memset(txc, 0, sizeof(struct timex)); if (!access_ok(VERIFY_READ, utp, sizeof(struct compat_timex)) || __get_user(txc->modes, &utp->modes) || __get_user(txc->offset, &utp->offset) || __get_user(txc->freq, &utp->freq) || __get_user(txc->maxerror, &utp->maxerror) || __get_user(txc->esterror, &utp->esterror) || __get_user(txc->status, &utp->status) || __get_user(txc->constant, &utp->constant) || __get_user(txc->precision, &utp->precision) || __get_user(txc->tolerance, &utp->tolerance) || __get_user(txc->time.tv_sec, &utp->time.tv_sec) || __get_user(txc->time.tv_usec, &utp->time.tv_usec) || __get_user(txc->tick, &utp->tick) || __get_user(txc->ppsfreq, &utp->ppsfreq) || __get_user(txc->jitter, &utp->jitter) || __get_user(txc->shift, &utp->shift) || __get_user(txc->stabil, &utp->stabil) || __get_user(txc->jitcnt, &utp->jitcnt) || __get_user(txc->calcnt, &utp->calcnt) || __get_user(txc->errcnt, &utp->errcnt) || __get_user(txc->stbcnt, &utp->stbcnt)) return -EFAULT; return 0; } static int compat_put_timex(struct compat_timex __user *utp, struct timex *txc) { if (!access_ok(VERIFY_WRITE, utp, sizeof(struct compat_timex)) || __put_user(txc->modes, &utp->modes) || __put_user(txc->offset, &utp->offset) || __put_user(txc->freq, &utp->freq) || __put_user(txc->maxerror, &utp->maxerror) || __put_user(txc->esterror, &utp->esterror) || __put_user(txc->status, &utp->status) || __put_user(txc->constant, &utp->constant) || __put_user(txc->precision, &utp->precision) || __put_user(txc->tolerance, &utp->tolerance) || __put_user(txc->time.tv_sec, &utp->time.tv_sec) || __put_user(txc->time.tv_usec, &utp->time.tv_usec) || __put_user(txc->tick, &utp->tick) || __put_user(txc->ppsfreq, &utp->ppsfreq) || __put_user(txc->jitter, &utp->jitter) || __put_user(txc->shift, &utp->shift) || __put_user(txc->stabil, &utp->stabil) || __put_user(txc->jitcnt, &utp->jitcnt) || __put_user(txc->calcnt, &utp->calcnt) || __put_user(txc->errcnt, &utp->errcnt) || __put_user(txc->stbcnt, &utp->stbcnt) || __put_user(txc->tai, &utp->tai)) return -EFAULT; return 0; } |
62a6fa976 kernel/compat: co... |
90 91 |
COMPAT_SYSCALL_DEFINE2(gettimeofday, struct compat_timeval __user *, tv, struct timezone __user *, tz) |
b418da16d compat: generic c... |
92 93 94 95 |
{ if (tv) { struct timeval ktv; do_gettimeofday(&ktv); |
81993e81a compat: Get rid o... |
96 |
if (compat_put_timeval(&ktv, tv)) |
b418da16d compat: generic c... |
97 98 99 100 101 102 103 104 105 |
return -EFAULT; } if (tz) { if (copy_to_user(tz, &sys_tz, sizeof(sys_tz))) return -EFAULT; } return 0; } |
62a6fa976 kernel/compat: co... |
106 107 |
COMPAT_SYSCALL_DEFINE2(settimeofday, struct compat_timeval __user *, tv, struct timezone __user *, tz) |
b418da16d compat: generic c... |
108 |
{ |
81993e81a compat: Get rid o... |
109 110 111 |
struct timeval user_tv; struct timespec new_ts; struct timezone new_tz; |
b418da16d compat: generic c... |
112 113 |
if (tv) { |
81993e81a compat: Get rid o... |
114 |
if (compat_get_timeval(&user_tv, tv)) |
b418da16d compat: generic c... |
115 |
return -EFAULT; |
81993e81a compat: Get rid o... |
116 117 |
new_ts.tv_sec = user_tv.tv_sec; new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC; |
b418da16d compat: generic c... |
118 119 |
} if (tz) { |
81993e81a compat: Get rid o... |
120 |
if (copy_from_user(&new_tz, tz, sizeof(*tz))) |
b418da16d compat: generic c... |
121 122 |
return -EFAULT; } |
81993e81a compat: Get rid o... |
123 |
return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL); |
b418da16d compat: generic c... |
124 |
} |
81993e81a compat: Get rid o... |
125 |
static int __compat_get_timeval(struct timeval *tv, const struct compat_timeval __user *ctv) |
6684ba202 compat: Add helpe... |
126 127 128 129 130 |
{ return (!access_ok(VERIFY_READ, ctv, sizeof(*ctv)) || __get_user(tv->tv_sec, &ctv->tv_sec) || __get_user(tv->tv_usec, &ctv->tv_usec)) ? -EFAULT : 0; } |
6684ba202 compat: Add helpe... |
131 |
|
81993e81a compat: Get rid o... |
132 |
static int __compat_put_timeval(const struct timeval *tv, struct compat_timeval __user *ctv) |
6684ba202 compat: Add helpe... |
133 134 135 136 137 |
{ return (!access_ok(VERIFY_WRITE, ctv, sizeof(*ctv)) || __put_user(tv->tv_sec, &ctv->tv_sec) || __put_user(tv->tv_usec, &ctv->tv_usec)) ? -EFAULT : 0; } |
6684ba202 compat: Add helpe... |
138 |
|
81993e81a compat: Get rid o... |
139 |
static int __compat_get_timespec(struct timespec *ts, const struct compat_timespec __user *cts) |
1da177e4c Linux-2.6.12-rc2 |
140 141 142 143 144 |
{ return (!access_ok(VERIFY_READ, cts, sizeof(*cts)) || __get_user(ts->tv_sec, &cts->tv_sec) || __get_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0; } |
81993e81a compat: Get rid o... |
145 |
static int __compat_put_timespec(const struct timespec *ts, struct compat_timespec __user *cts) |
1da177e4c Linux-2.6.12-rc2 |
146 147 148 149 150 |
{ return (!access_ok(VERIFY_WRITE, cts, sizeof(*cts)) || __put_user(ts->tv_sec, &cts->tv_sec) || __put_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0; } |
6684ba202 compat: Add helpe... |
151 152 153 |
int compat_get_timeval(struct timeval *tv, const void __user *utv) { if (COMPAT_USE_64BIT_TIME) |
6516a4661 kernel/compat.c: ... |
154 |
return copy_from_user(tv, utv, sizeof(*tv)) ? -EFAULT : 0; |
6684ba202 compat: Add helpe... |
155 |
else |
81993e81a compat: Get rid o... |
156 |
return __compat_get_timeval(tv, utv); |
6684ba202 compat: Add helpe... |
157 158 159 160 161 162 |
} EXPORT_SYMBOL_GPL(compat_get_timeval); int compat_put_timeval(const struct timeval *tv, void __user *utv) { if (COMPAT_USE_64BIT_TIME) |
6516a4661 kernel/compat.c: ... |
163 |
return copy_to_user(utv, tv, sizeof(*tv)) ? -EFAULT : 0; |
6684ba202 compat: Add helpe... |
164 |
else |
81993e81a compat: Get rid o... |
165 |
return __compat_put_timeval(tv, utv); |
6684ba202 compat: Add helpe... |
166 167 168 169 170 171 |
} EXPORT_SYMBOL_GPL(compat_put_timeval); int compat_get_timespec(struct timespec *ts, const void __user *uts) { if (COMPAT_USE_64BIT_TIME) |
6516a4661 kernel/compat.c: ... |
172 |
return copy_from_user(ts, uts, sizeof(*ts)) ? -EFAULT : 0; |
6684ba202 compat: Add helpe... |
173 |
else |
81993e81a compat: Get rid o... |
174 |
return __compat_get_timespec(ts, uts); |
6684ba202 compat: Add helpe... |
175 176 177 178 179 180 |
} EXPORT_SYMBOL_GPL(compat_get_timespec); int compat_put_timespec(const struct timespec *ts, void __user *uts) { if (COMPAT_USE_64BIT_TIME) |
6516a4661 kernel/compat.c: ... |
181 |
return copy_to_user(uts, ts, sizeof(*ts)) ? -EFAULT : 0; |
6684ba202 compat: Add helpe... |
182 |
else |
81993e81a compat: Get rid o... |
183 |
return __compat_put_timespec(ts, uts); |
6684ba202 compat: Add helpe... |
184 185 |
} EXPORT_SYMBOL_GPL(compat_put_timespec); |
81993e81a compat: Get rid o... |
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 |
int compat_convert_timespec(struct timespec __user **kts, const void __user *cts) { struct timespec ts; struct timespec __user *uts; if (!cts || COMPAT_USE_64BIT_TIME) { *kts = (struct timespec __user *)cts; return 0; } uts = compat_alloc_user_space(sizeof(ts)); if (!uts) return -EFAULT; if (compat_get_timespec(&ts, cts)) return -EFAULT; if (copy_to_user(uts, &ts, sizeof(ts))) return -EFAULT; *kts = uts; return 0; } |
416529374 hrtimer: fix *rmt... |
208 209 210 211 212 213 |
static long compat_nanosleep_restart(struct restart_block *restart) { struct compat_timespec __user *rmtp; struct timespec rmt; mm_segment_t oldfs; long ret; |
029a07e03 hrtimer: use nano... |
214 |
restart->nanosleep.rmtp = (struct timespec __user *) &rmt; |
416529374 hrtimer: fix *rmt... |
215 216 217 218 |
oldfs = get_fs(); set_fs(KERNEL_DS); ret = hrtimer_nanosleep_restart(restart); set_fs(oldfs); |
849151dd5 compat: nanosleep... |
219 |
if (ret == -ERESTART_RESTARTBLOCK) { |
029a07e03 hrtimer: use nano... |
220 |
rmtp = restart->nanosleep.compat_rmtp; |
416529374 hrtimer: fix *rmt... |
221 |
|
81993e81a compat: Get rid o... |
222 |
if (rmtp && compat_put_timespec(&rmt, rmtp)) |
416529374 hrtimer: fix *rmt... |
223 224 225 226 227 |
return -EFAULT; } return ret; } |
62a6fa976 kernel/compat: co... |
228 229 |
COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp, struct compat_timespec __user *, rmtp) |
1da177e4c Linux-2.6.12-rc2 |
230 |
{ |
c70878b4e hrtimer: hook com... |
231 |
struct timespec tu, rmt; |
416529374 hrtimer: fix *rmt... |
232 |
mm_segment_t oldfs; |
c70878b4e hrtimer: hook com... |
233 |
long ret; |
1da177e4c Linux-2.6.12-rc2 |
234 |
|
81993e81a compat: Get rid o... |
235 |
if (compat_get_timespec(&tu, rqtp)) |
1da177e4c Linux-2.6.12-rc2 |
236 |
return -EFAULT; |
c70878b4e hrtimer: hook com... |
237 |
if (!timespec_valid(&tu)) |
1da177e4c Linux-2.6.12-rc2 |
238 |
return -EINVAL; |
416529374 hrtimer: fix *rmt... |
239 240 241 242 243 244 |
oldfs = get_fs(); set_fs(KERNEL_DS); ret = hrtimer_nanosleep(&tu, rmtp ? (struct timespec __user *)&rmt : NULL, HRTIMER_MODE_REL, CLOCK_MONOTONIC); set_fs(oldfs); |
849151dd5 compat: nanosleep... |
245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
/* * hrtimer_nanosleep() can only return 0 or * -ERESTART_RESTARTBLOCK here because: * * - we call it with HRTIMER_MODE_REL and therefor exclude the * -ERESTARTNOHAND return path. * * - we supply the rmtp argument from the task stack (due to * the necessary compat conversion. So the update cannot * fail, which excludes the -EFAULT return path as well. If * it fails nevertheless we have a bigger problem and wont * reach this place anymore. * * - if the return value is 0, we do not have to update rmtp * because there is no remaining time. * * We check for -ERESTART_RESTARTBLOCK nevertheless if the * core implementation decides to return random nonsense. */ if (ret == -ERESTART_RESTARTBLOCK) { |
f56141e3e all arches, signa... |
265 |
struct restart_block *restart = ¤t->restart_block; |
416529374 hrtimer: fix *rmt... |
266 267 |
restart->fn = compat_nanosleep_restart; |
029a07e03 hrtimer: use nano... |
268 |
restart->nanosleep.compat_rmtp = rmtp; |
1da177e4c Linux-2.6.12-rc2 |
269 |
|
81993e81a compat: Get rid o... |
270 |
if (rmtp && compat_put_timespec(&rmt, rmtp)) |
1da177e4c Linux-2.6.12-rc2 |
271 272 |
return -EFAULT; } |
c70878b4e hrtimer: hook com... |
273 |
return ret; |
1da177e4c Linux-2.6.12-rc2 |
274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
} static inline long get_compat_itimerval(struct itimerval *o, struct compat_itimerval __user *i) { return (!access_ok(VERIFY_READ, i, sizeof(*i)) || (__get_user(o->it_interval.tv_sec, &i->it_interval.tv_sec) | __get_user(o->it_interval.tv_usec, &i->it_interval.tv_usec) | __get_user(o->it_value.tv_sec, &i->it_value.tv_sec) | __get_user(o->it_value.tv_usec, &i->it_value.tv_usec))); } static inline long put_compat_itimerval(struct compat_itimerval __user *o, struct itimerval *i) { return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) || (__put_user(i->it_interval.tv_sec, &o->it_interval.tv_sec) | __put_user(i->it_interval.tv_usec, &o->it_interval.tv_usec) | __put_user(i->it_value.tv_sec, &o->it_value.tv_sec) | __put_user(i->it_value.tv_usec, &o->it_value.tv_usec))); } |
377840744 switch compat_sys... |
295 296 |
COMPAT_SYSCALL_DEFINE2(getitimer, int, which, struct compat_itimerval __user *, it) |
1da177e4c Linux-2.6.12-rc2 |
297 298 299 300 301 302 303 304 305 |
{ struct itimerval kit; int error; error = do_getitimer(which, &kit); if (!error && put_compat_itimerval(it, &kit)) error = -EFAULT; return error; } |
377840744 switch compat_sys... |
306 307 308 |
COMPAT_SYSCALL_DEFINE3(setitimer, int, which, struct compat_itimerval __user *, in, struct compat_itimerval __user *, out) |
1da177e4c Linux-2.6.12-rc2 |
309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 |
{ struct itimerval kin, kout; int error; if (in) { if (get_compat_itimerval(&kin, in)) return -EFAULT; } else memset(&kin, 0, sizeof(kin)); error = do_setitimer(which, &kin, out ? &kout : NULL); if (error || !out) return error; if (put_compat_itimerval(out, &kout)) return -EFAULT; return 0; } |
f06febc96 timers: fix itime... |
326 327 328 329 |
static compat_clock_t clock_t_to_compat_clock_t(clock_t x) { return compat_jiffies_to_clock_t(clock_t_to_jiffies(x)); } |
62a6fa976 kernel/compat: co... |
330 |
COMPAT_SYSCALL_DEFINE1(times, struct compat_tms __user *, tbuf) |
1da177e4c Linux-2.6.12-rc2 |
331 |
{ |
1da177e4c Linux-2.6.12-rc2 |
332 |
if (tbuf) { |
f06febc96 timers: fix itime... |
333 |
struct tms tms; |
1da177e4c Linux-2.6.12-rc2 |
334 |
struct compat_tms tmp; |
f06febc96 timers: fix itime... |
335 336 337 338 339 340 341 |
do_sys_times(&tms); /* Convert our struct tms to the compat version. */ tmp.tms_utime = clock_t_to_compat_clock_t(tms.tms_utime); tmp.tms_stime = clock_t_to_compat_clock_t(tms.tms_stime); tmp.tms_cutime = clock_t_to_compat_clock_t(tms.tms_cutime); tmp.tms_cstime = clock_t_to_compat_clock_t(tms.tms_cstime); |
1da177e4c Linux-2.6.12-rc2 |
342 343 344 |
if (copy_to_user(tbuf, &tmp, sizeof(tmp))) return -EFAULT; } |
e3d5a27d5 Allow times and t... |
345 |
force_successful_syscall_return(); |
1da177e4c Linux-2.6.12-rc2 |
346 347 |
return compat_jiffies_to_clock_t(jiffies); } |
be84cb438 compat: fixes to ... |
348 |
#ifdef __ARCH_WANT_SYS_SIGPENDING |
1da177e4c Linux-2.6.12-rc2 |
349 350 351 352 |
/* * Assumption: old_sigset_t and compat_old_sigset_t are both * types that can be passed to put_user()/get_user(). */ |
62a6fa976 kernel/compat: co... |
353 |
COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set) |
1da177e4c Linux-2.6.12-rc2 |
354 355 356 357 358 359 360 361 362 363 364 365 |
{ old_sigset_t s; long ret; mm_segment_t old_fs = get_fs(); set_fs(KERNEL_DS); ret = sys_sigpending((old_sigset_t __user *) &s); set_fs(old_fs); if (ret == 0) ret = put_user(s, set); return ret; } |
be84cb438 compat: fixes to ... |
366 367 368 |
#endif #ifdef __ARCH_WANT_SYS_SIGPROCMASK |
b7dafa0ef compat: Fix RT si... |
369 370 371 372 373 |
/* * sys_sigprocmask SIG_SETMASK sets the first (compat) word of the * blocked set of signals to the supplied signal set */ static inline void compat_sig_setmask(sigset_t *blocked, compat_sigset_word set) |
1da177e4c Linux-2.6.12-rc2 |
374 |
{ |
b7dafa0ef compat: Fix RT si... |
375 376 |
memcpy(blocked->sig, &set, sizeof(set)); } |
1da177e4c Linux-2.6.12-rc2 |
377 |
|
5cf221002 switch compat_sys... |
378 379 380 |
COMPAT_SYSCALL_DEFINE3(sigprocmask, int, how, compat_old_sigset_t __user *, nset, compat_old_sigset_t __user *, oset) |
b7dafa0ef compat: Fix RT si... |
381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 |
{ old_sigset_t old_set, new_set; sigset_t new_blocked; old_set = current->blocked.sig[0]; if (nset) { if (get_user(new_set, nset)) return -EFAULT; new_set &= ~(sigmask(SIGKILL) | sigmask(SIGSTOP)); new_blocked = current->blocked; switch (how) { case SIG_BLOCK: sigaddsetmask(&new_blocked, new_set); break; case SIG_UNBLOCK: sigdelsetmask(&new_blocked, new_set); break; case SIG_SETMASK: compat_sig_setmask(&new_blocked, new_set); break; default: return -EINVAL; } set_current_blocked(&new_blocked); } if (oset) { if (put_user(old_set, oset)) return -EFAULT; } return 0; |
1da177e4c Linux-2.6.12-rc2 |
417 |
} |
be84cb438 compat: fixes to ... |
418 |
#endif |
62a6fa976 kernel/compat: co... |
419 420 |
COMPAT_SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct compat_rlimit __user *, rlim) |
1da177e4c Linux-2.6.12-rc2 |
421 422 |
{ struct rlimit r; |
1da177e4c Linux-2.6.12-rc2 |
423 424 425 426 427 428 429 430 431 432 |
if (!access_ok(VERIFY_READ, rlim, sizeof(*rlim)) || __get_user(r.rlim_cur, &rlim->rlim_cur) || __get_user(r.rlim_max, &rlim->rlim_max)) return -EFAULT; if (r.rlim_cur == COMPAT_RLIM_INFINITY) r.rlim_cur = RLIM_INFINITY; if (r.rlim_max == COMPAT_RLIM_INFINITY) r.rlim_max = RLIM_INFINITY; |
b95183453 rlimits: switch m... |
433 |
return do_prlimit(current, resource, &r, NULL); |
1da177e4c Linux-2.6.12-rc2 |
434 435 436 |
} #ifdef COMPAT_RLIM_OLD_INFINITY |
62a6fa976 kernel/compat: co... |
437 438 |
COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource, struct compat_rlimit __user *, rlim) |
1da177e4c Linux-2.6.12-rc2 |
439 440 441 442 443 444 |
{ struct rlimit r; int ret; mm_segment_t old_fs = get_fs(); set_fs(KERNEL_DS); |
dce44e03b compat: Fix spars... |
445 |
ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r); |
1da177e4c Linux-2.6.12-rc2 |
446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 |
set_fs(old_fs); if (!ret) { if (r.rlim_cur > COMPAT_RLIM_OLD_INFINITY) r.rlim_cur = COMPAT_RLIM_INFINITY; if (r.rlim_max > COMPAT_RLIM_OLD_INFINITY) r.rlim_max = COMPAT_RLIM_INFINITY; if (!access_ok(VERIFY_WRITE, rlim, sizeof(*rlim)) || __put_user(r.rlim_cur, &rlim->rlim_cur) || __put_user(r.rlim_max, &rlim->rlim_max)) return -EFAULT; } return ret; } #endif |
62a6fa976 kernel/compat: co... |
463 464 |
COMPAT_SYSCALL_DEFINE2(getrlimit, unsigned int, resource, struct compat_rlimit __user *, rlim) |
1da177e4c Linux-2.6.12-rc2 |
465 466 467 |
{ struct rlimit r; int ret; |
1da177e4c Linux-2.6.12-rc2 |
468 |
|
b95183453 rlimits: switch m... |
469 |
ret = do_prlimit(current, resource, NULL, &r); |
1da177e4c Linux-2.6.12-rc2 |
470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 |
if (!ret) { if (r.rlim_cur > COMPAT_RLIM_INFINITY) r.rlim_cur = COMPAT_RLIM_INFINITY; if (r.rlim_max > COMPAT_RLIM_INFINITY) r.rlim_max = COMPAT_RLIM_INFINITY; if (!access_ok(VERIFY_WRITE, rlim, sizeof(*rlim)) || __put_user(r.rlim_cur, &rlim->rlim_cur) || __put_user(r.rlim_max, &rlim->rlim_max)) return -EFAULT; } return ret; } int put_compat_rusage(const struct rusage *r, struct compat_rusage __user *ru) { if (!access_ok(VERIFY_WRITE, ru, sizeof(*ru)) || __put_user(r->ru_utime.tv_sec, &ru->ru_utime.tv_sec) || __put_user(r->ru_utime.tv_usec, &ru->ru_utime.tv_usec) || __put_user(r->ru_stime.tv_sec, &ru->ru_stime.tv_sec) || __put_user(r->ru_stime.tv_usec, &ru->ru_stime.tv_usec) || __put_user(r->ru_maxrss, &ru->ru_maxrss) || __put_user(r->ru_ixrss, &ru->ru_ixrss) || __put_user(r->ru_idrss, &ru->ru_idrss) || __put_user(r->ru_isrss, &ru->ru_isrss) || __put_user(r->ru_minflt, &ru->ru_minflt) || __put_user(r->ru_majflt, &ru->ru_majflt) || __put_user(r->ru_nswap, &ru->ru_nswap) || __put_user(r->ru_inblock, &ru->ru_inblock) || __put_user(r->ru_oublock, &ru->ru_oublock) || __put_user(r->ru_msgsnd, &ru->ru_msgsnd) || __put_user(r->ru_msgrcv, &ru->ru_msgrcv) || __put_user(r->ru_nsignals, &ru->ru_nsignals) || __put_user(r->ru_nvcsw, &ru->ru_nvcsw) || __put_user(r->ru_nivcsw, &ru->ru_nivcsw)) return -EFAULT; return 0; } |
8d9807b10 switch compat_sys... |
508 509 510 511 512 |
COMPAT_SYSCALL_DEFINE4(wait4, compat_pid_t, pid, compat_uint_t __user *, stat_addr, int, options, struct compat_rusage __user *, ru) |
1da177e4c Linux-2.6.12-rc2 |
513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 |
{ if (!ru) { return sys_wait4(pid, stat_addr, options, NULL); } else { struct rusage r; int ret; unsigned int status; mm_segment_t old_fs = get_fs(); set_fs (KERNEL_DS); ret = sys_wait4(pid, (stat_addr ? (unsigned int __user *) &status : NULL), options, (struct rusage __user *) &r); set_fs (old_fs); if (ret > 0) { if (put_compat_rusage(&r, ru)) return -EFAULT; if (stat_addr && put_user(status, stat_addr)) return -EFAULT; } return ret; } } |
8d9807b10 switch compat_sys... |
538 539 540 541 |
COMPAT_SYSCALL_DEFINE5(waitid, int, which, compat_pid_t, pid, struct compat_siginfo __user *, uinfo, int, options, struct compat_rusage __user *, uru) |
1da177e4c Linux-2.6.12-rc2 |
542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 |
{ siginfo_t info; struct rusage ru; long ret; mm_segment_t old_fs = get_fs(); memset(&info, 0, sizeof(info)); set_fs(KERNEL_DS); ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options, uru ? (struct rusage __user *)&ru : NULL); set_fs(old_fs); if ((ret < 0) || (info.si_signo == 0)) return ret; if (uru) { |
a566c2888 x32: fix waitid() |
559 560 561 562 563 |
/* sys_waitid() overwrites everything in ru */ if (COMPAT_USE_64BIT_TIME) ret = copy_to_user(uru, &ru, sizeof(ru)); else ret = put_compat_rusage(&ru, uru); |
1da177e4c Linux-2.6.12-rc2 |
564 |
if (ret) |
bffea77c0 compat: return -E... |
565 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
566 567 568 569 570 571 572 573 |
} BUG_ON(info.si_code & __SI_MASK); info.si_code |= __SI_CHLD; return copy_siginfo_to_user32(uinfo, &info); } static int compat_get_user_cpu_mask(compat_ulong_t __user *user_mask_ptr, |
a45185d2d cpumask: convert ... |
574 |
unsigned len, struct cpumask *new_mask) |
1da177e4c Linux-2.6.12-rc2 |
575 576 |
{ unsigned long *k; |
a45185d2d cpumask: convert ... |
577 578 579 580 |
if (len < cpumask_size()) memset(new_mask, 0, cpumask_size()); else if (len > cpumask_size()) len = cpumask_size(); |
1da177e4c Linux-2.6.12-rc2 |
581 |
|
a45185d2d cpumask: convert ... |
582 |
k = cpumask_bits(new_mask); |
1da177e4c Linux-2.6.12-rc2 |
583 584 |
return compat_get_bitmap(k, user_mask_ptr, len * 8); } |
62a6fa976 kernel/compat: co... |
585 586 587 |
COMPAT_SYSCALL_DEFINE3(sched_setaffinity, compat_pid_t, pid, unsigned int, len, compat_ulong_t __user *, user_mask_ptr) |
1da177e4c Linux-2.6.12-rc2 |
588 |
{ |
a45185d2d cpumask: convert ... |
589 |
cpumask_var_t new_mask; |
1da177e4c Linux-2.6.12-rc2 |
590 |
int retval; |
a45185d2d cpumask: convert ... |
591 592 593 594 |
if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) return -ENOMEM; retval = compat_get_user_cpu_mask(user_mask_ptr, len, new_mask); |
1da177e4c Linux-2.6.12-rc2 |
595 |
if (retval) |
a45185d2d cpumask: convert ... |
596 |
goto out; |
1da177e4c Linux-2.6.12-rc2 |
597 |
|
a45185d2d cpumask: convert ... |
598 599 600 601 |
retval = sched_setaffinity(pid, new_mask); out: free_cpumask_var(new_mask); return retval; |
1da177e4c Linux-2.6.12-rc2 |
602 |
} |
62a6fa976 kernel/compat: co... |
603 604 |
COMPAT_SYSCALL_DEFINE3(sched_getaffinity, compat_pid_t, pid, unsigned int, len, compat_ulong_t __user *, user_mask_ptr) |
1da177e4c Linux-2.6.12-rc2 |
605 606 |
{ int ret; |
a45185d2d cpumask: convert ... |
607 |
cpumask_var_t mask; |
1da177e4c Linux-2.6.12-rc2 |
608 |
|
fa9dc265a cpumask: fix comp... |
609 610 611 |
if ((len * BITS_PER_BYTE) < nr_cpu_ids) return -EINVAL; if (len & (sizeof(compat_ulong_t)-1)) |
1da177e4c Linux-2.6.12-rc2 |
612 |
return -EINVAL; |
a45185d2d cpumask: convert ... |
613 614 615 616 |
if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; ret = sched_getaffinity(pid, mask); |
fa9dc265a cpumask: fix comp... |
617 618 |
if (ret == 0) { size_t retlen = min_t(size_t, len, cpumask_size()); |
1da177e4c Linux-2.6.12-rc2 |
619 |
|
fa9dc265a cpumask: fix comp... |
620 621 622 623 624 |
if (compat_put_bitmap(user_mask_ptr, cpumask_bits(mask), retlen * 8)) ret = -EFAULT; else ret = retlen; } |
a45185d2d cpumask: convert ... |
625 |
free_cpumask_var(mask); |
fa9dc265a cpumask: fix comp... |
626 |
|
a45185d2d cpumask: convert ... |
627 |
return ret; |
1da177e4c Linux-2.6.12-rc2 |
628 |
} |
83f5d1266 signal/timer/even... |
629 630 |
int get_compat_itimerspec(struct itimerspec *dst, const struct compat_itimerspec __user *src) |
bd3a8492b whitespace fixes:... |
631 |
{ |
81993e81a compat: Get rid o... |
632 633 |
if (__compat_get_timespec(&dst->it_interval, &src->it_interval) || __compat_get_timespec(&dst->it_value, &src->it_value)) |
1da177e4c Linux-2.6.12-rc2 |
634 635 |
return -EFAULT; return 0; |
bd3a8492b whitespace fixes:... |
636 |
} |
1da177e4c Linux-2.6.12-rc2 |
637 |
|
83f5d1266 signal/timer/even... |
638 639 |
int put_compat_itimerspec(struct compat_itimerspec __user *dst, const struct itimerspec *src) |
bd3a8492b whitespace fixes:... |
640 |
{ |
81993e81a compat: Get rid o... |
641 642 |
if (__compat_put_timespec(&src->it_interval, &dst->it_interval) || __compat_put_timespec(&src->it_value, &dst->it_value)) |
1da177e4c Linux-2.6.12-rc2 |
643 644 |
return -EFAULT; return 0; |
bd3a8492b whitespace fixes:... |
645 |
} |
1da177e4c Linux-2.6.12-rc2 |
646 |
|
62a6fa976 kernel/compat: co... |
647 648 649 |
COMPAT_SYSCALL_DEFINE3(timer_create, clockid_t, which_clock, struct compat_sigevent __user *, timer_event_spec, timer_t __user *, created_timer_id) |
3a0f69d59 [PATCH] common co... |
650 651 652 653 654 655 656 657 658 659 660 661 662 663 |
{ struct sigevent __user *event = NULL; if (timer_event_spec) { struct sigevent kevent; event = compat_alloc_user_space(sizeof(*event)); if (get_compat_sigevent(&kevent, timer_event_spec) || copy_to_user(event, &kevent, sizeof(*event))) return -EFAULT; } return sys_timer_create(which_clock, event, created_timer_id); } |
62a6fa976 kernel/compat: co... |
664 665 666 |
COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags, struct compat_itimerspec __user *, new, struct compat_itimerspec __user *, old) |
bd3a8492b whitespace fixes:... |
667 |
{ |
1da177e4c Linux-2.6.12-rc2 |
668 669 670 671 672 673 674 |
long err; mm_segment_t oldfs; struct itimerspec newts, oldts; if (!new) return -EINVAL; if (get_compat_itimerspec(&newts, new)) |
bd3a8492b whitespace fixes:... |
675 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
676 677 678 679 680 |
oldfs = get_fs(); set_fs(KERNEL_DS); err = sys_timer_settime(timer_id, flags, (struct itimerspec __user *) &newts, (struct itimerspec __user *) &oldts); |
bd3a8492b whitespace fixes:... |
681 |
set_fs(oldfs); |
1da177e4c Linux-2.6.12-rc2 |
682 683 684 |
if (!err && old && put_compat_itimerspec(old, &oldts)) return -EFAULT; return err; |
bd3a8492b whitespace fixes:... |
685 |
} |
1da177e4c Linux-2.6.12-rc2 |
686 |
|
62a6fa976 kernel/compat: co... |
687 688 |
COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id, struct compat_itimerspec __user *, setting) |
bd3a8492b whitespace fixes:... |
689 |
{ |
1da177e4c Linux-2.6.12-rc2 |
690 691 |
long err; mm_segment_t oldfs; |
bd3a8492b whitespace fixes:... |
692 |
struct itimerspec ts; |
1da177e4c Linux-2.6.12-rc2 |
693 694 695 696 |
oldfs = get_fs(); set_fs(KERNEL_DS); err = sys_timer_gettime(timer_id, |
bd3a8492b whitespace fixes:... |
697 698 |
(struct itimerspec __user *) &ts); set_fs(oldfs); |
1da177e4c Linux-2.6.12-rc2 |
699 700 701 |
if (!err && put_compat_itimerspec(setting, &ts)) return -EFAULT; return err; |
bd3a8492b whitespace fixes:... |
702 |
} |
1da177e4c Linux-2.6.12-rc2 |
703 |
|
62a6fa976 kernel/compat: co... |
704 705 |
COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock, struct compat_timespec __user *, tp) |
1da177e4c Linux-2.6.12-rc2 |
706 707 708 |
{ long err; mm_segment_t oldfs; |
bd3a8492b whitespace fixes:... |
709 |
struct timespec ts; |
1da177e4c Linux-2.6.12-rc2 |
710 |
|
81993e81a compat: Get rid o... |
711 |
if (compat_get_timespec(&ts, tp)) |
bd3a8492b whitespace fixes:... |
712 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
713 |
oldfs = get_fs(); |
bd3a8492b whitespace fixes:... |
714 |
set_fs(KERNEL_DS); |
1da177e4c Linux-2.6.12-rc2 |
715 716 717 718 |
err = sys_clock_settime(which_clock, (struct timespec __user *) &ts); set_fs(oldfs); return err; |
bd3a8492b whitespace fixes:... |
719 |
} |
1da177e4c Linux-2.6.12-rc2 |
720 |
|
62a6fa976 kernel/compat: co... |
721 722 |
COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock, struct compat_timespec __user *, tp) |
1da177e4c Linux-2.6.12-rc2 |
723 724 725 |
{ long err; mm_segment_t oldfs; |
bd3a8492b whitespace fixes:... |
726 |
struct timespec ts; |
1da177e4c Linux-2.6.12-rc2 |
727 728 729 730 731 732 |
oldfs = get_fs(); set_fs(KERNEL_DS); err = sys_clock_gettime(which_clock, (struct timespec __user *) &ts); set_fs(oldfs); |
81993e81a compat: Get rid o... |
733 |
if (!err && compat_put_timespec(&ts, tp)) |
bd3a8492b whitespace fixes:... |
734 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
735 |
return err; |
bd3a8492b whitespace fixes:... |
736 |
} |
1da177e4c Linux-2.6.12-rc2 |
737 |
|
62a6fa976 kernel/compat: co... |
738 739 |
COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock, struct compat_timex __user *, utp) |
f1f1d5ebd posix-timers: Int... |
740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 |
{ struct timex txc; mm_segment_t oldfs; int err, ret; err = compat_get_timex(&txc, utp); if (err) return err; oldfs = get_fs(); set_fs(KERNEL_DS); ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc); set_fs(oldfs); err = compat_put_timex(utp, &txc); if (err) return err; return ret; } |
62a6fa976 kernel/compat: co... |
760 761 |
COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock, struct compat_timespec __user *, tp) |
1da177e4c Linux-2.6.12-rc2 |
762 763 764 |
{ long err; mm_segment_t oldfs; |
bd3a8492b whitespace fixes:... |
765 |
struct timespec ts; |
1da177e4c Linux-2.6.12-rc2 |
766 767 768 769 770 771 |
oldfs = get_fs(); set_fs(KERNEL_DS); err = sys_clock_getres(which_clock, (struct timespec __user *) &ts); set_fs(oldfs); |
81993e81a compat: Get rid o... |
772 |
if (!err && tp && compat_put_timespec(&ts, tp)) |
bd3a8492b whitespace fixes:... |
773 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
774 |
return err; |
bd3a8492b whitespace fixes:... |
775 |
} |
1da177e4c Linux-2.6.12-rc2 |
776 |
|
1711ef386 [PATCH] posix-tim... |
777 778 779 780 781 |
static long compat_clock_nanosleep_restart(struct restart_block *restart) { long err; mm_segment_t oldfs; struct timespec tu; |
dce44e03b compat: Fix spars... |
782 |
struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp; |
1711ef386 [PATCH] posix-tim... |
783 |
|
029a07e03 hrtimer: use nano... |
784 |
restart->nanosleep.rmtp = (struct timespec __user *) &tu; |
1711ef386 [PATCH] posix-tim... |
785 786 787 788 789 790 |
oldfs = get_fs(); set_fs(KERNEL_DS); err = clock_nanosleep_restart(restart); set_fs(oldfs); if ((err == -ERESTART_RESTARTBLOCK) && rmtp && |
81993e81a compat: Get rid o... |
791 |
compat_put_timespec(&tu, rmtp)) |
1711ef386 [PATCH] posix-tim... |
792 793 794 795 |
return -EFAULT; if (err == -ERESTART_RESTARTBLOCK) { restart->fn = compat_clock_nanosleep_restart; |
029a07e03 hrtimer: use nano... |
796 |
restart->nanosleep.compat_rmtp = rmtp; |
1711ef386 [PATCH] posix-tim... |
797 798 799 |
} return err; } |
62a6fa976 kernel/compat: co... |
800 801 802 |
COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags, struct compat_timespec __user *, rqtp, struct compat_timespec __user *, rmtp) |
1da177e4c Linux-2.6.12-rc2 |
803 804 805 |
{ long err; mm_segment_t oldfs; |
bd3a8492b whitespace fixes:... |
806 |
struct timespec in, out; |
1711ef386 [PATCH] posix-tim... |
807 |
struct restart_block *restart; |
1da177e4c Linux-2.6.12-rc2 |
808 |
|
81993e81a compat: Get rid o... |
809 |
if (compat_get_timespec(&in, rqtp)) |
1da177e4c Linux-2.6.12-rc2 |
810 811 812 813 814 815 816 817 |
return -EFAULT; oldfs = get_fs(); set_fs(KERNEL_DS); err = sys_clock_nanosleep(which_clock, flags, (struct timespec __user *) &in, (struct timespec __user *) &out); set_fs(oldfs); |
1711ef386 [PATCH] posix-tim... |
818 |
|
1da177e4c Linux-2.6.12-rc2 |
819 |
if ((err == -ERESTART_RESTARTBLOCK) && rmtp && |
81993e81a compat: Get rid o... |
820 |
compat_put_timespec(&out, rmtp)) |
1da177e4c Linux-2.6.12-rc2 |
821 |
return -EFAULT; |
1711ef386 [PATCH] posix-tim... |
822 823 |
if (err == -ERESTART_RESTARTBLOCK) { |
f56141e3e all arches, signa... |
824 |
restart = ¤t->restart_block; |
1711ef386 [PATCH] posix-tim... |
825 |
restart->fn = compat_clock_nanosleep_restart; |
029a07e03 hrtimer: use nano... |
826 |
restart->nanosleep.compat_rmtp = rmtp; |
1711ef386 [PATCH] posix-tim... |
827 |
} |
bd3a8492b whitespace fixes:... |
828 829 |
return err; } |
1da177e4c Linux-2.6.12-rc2 |
830 831 832 833 834 835 836 837 838 839 840 |
/* * We currently only need the following fields from the sigevent * structure: sigev_value, sigev_signo, sig_notify and (sometimes * sigev_notify_thread_id). The others are handled in user mode. * We also assume that copying sigev_value.sival_int is sufficient * to keep all the bits of sigev_value.sival_ptr intact. */ int get_compat_sigevent(struct sigevent *event, const struct compat_sigevent __user *u_event) { |
51410d3c5 [PATCH] Fix get_c... |
841 |
memset(event, 0, sizeof(*event)); |
1da177e4c Linux-2.6.12-rc2 |
842 843 844 845 846 847 848 849 850 |
return (!access_ok(VERIFY_READ, u_event, sizeof(*u_event)) || __get_user(event->sigev_value.sival_int, &u_event->sigev_value.sival_int) || __get_user(event->sigev_signo, &u_event->sigev_signo) || __get_user(event->sigev_notify, &u_event->sigev_notify) || __get_user(event->sigev_notify_thread_id, &u_event->sigev_notify_thread_id)) ? -EFAULT : 0; } |
5fa3839a6 [PATCH] Constify ... |
851 |
long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask, |
1da177e4c Linux-2.6.12-rc2 |
852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 |
unsigned long bitmap_size) { int i, j; unsigned long m; compat_ulong_t um; unsigned long nr_compat_longs; /* align bitmap up to nearest compat_long_t boundary */ bitmap_size = ALIGN(bitmap_size, BITS_PER_COMPAT_LONG); if (!access_ok(VERIFY_READ, umask, bitmap_size / 8)) return -EFAULT; nr_compat_longs = BITS_TO_COMPAT_LONGS(bitmap_size); for (i = 0; i < BITS_TO_LONGS(bitmap_size); i++) { m = 0; for (j = 0; j < sizeof(m)/sizeof(um); j++) { /* * We dont want to read past the end of the userspace * bitmap. We must however ensure the end of the * kernel bitmap is zeroed. */ |
9b7b819ca compat: cleanup c... |
876 877 |
if (nr_compat_longs) { nr_compat_longs--; |
1da177e4c Linux-2.6.12-rc2 |
878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 |
if (__get_user(um, umask)) return -EFAULT; } else { um = 0; } umask++; m |= (long)um << (j * BITS_PER_COMPAT_LONG); } *mask++ = m; } return 0; } long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask, unsigned long bitmap_size) { int i, j; unsigned long m; compat_ulong_t um; unsigned long nr_compat_longs; /* align bitmap up to nearest compat_long_t boundary */ bitmap_size = ALIGN(bitmap_size, BITS_PER_COMPAT_LONG); if (!access_ok(VERIFY_WRITE, umask, bitmap_size / 8)) return -EFAULT; nr_compat_longs = BITS_TO_COMPAT_LONGS(bitmap_size); for (i = 0; i < BITS_TO_LONGS(bitmap_size); i++) { m = *mask++; for (j = 0; j < sizeof(m)/sizeof(um); j++) { um = m; /* * We dont want to write past the end of the userspace * bitmap. */ |
9b7b819ca compat: cleanup c... |
919 920 |
if (nr_compat_longs) { nr_compat_longs--; |
1da177e4c Linux-2.6.12-rc2 |
921 922 923 924 925 926 927 928 929 930 931 932 933 934 |
if (__put_user(um, umask)) return -EFAULT; } umask++; m >>= 4*sizeof(um); m >>= 4*sizeof(um); } } return 0; } void |
322a56cb1 generic compat_sy... |
935 |
sigset_from_compat(sigset_t *set, const compat_sigset_t *compat) |
1da177e4c Linux-2.6.12-rc2 |
936 937 |
{ switch (_NSIG_WORDS) { |
1da177e4c Linux-2.6.12-rc2 |
938 939 940 941 |
case 4: set->sig[3] = compat->sig[6] | (((long)compat->sig[7]) << 32 ); case 3: set->sig[2] = compat->sig[4] | (((long)compat->sig[5]) << 32 ); case 2: set->sig[1] = compat->sig[2] | (((long)compat->sig[3]) << 32 ); case 1: set->sig[0] = compat->sig[0] | (((long)compat->sig[1]) << 32 ); |
1da177e4c Linux-2.6.12-rc2 |
942 943 |
} } |
1dda606c5 KVM: Add compat i... |
944 |
EXPORT_SYMBOL_GPL(sigset_from_compat); |
1da177e4c Linux-2.6.12-rc2 |
945 |
|
322a56cb1 generic compat_sy... |
946 947 948 949 950 951 952 953 954 955 |
void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set) { switch (_NSIG_WORDS) { case 4: compat->sig[7] = (set->sig[3] >> 32); compat->sig[6] = set->sig[3]; case 3: compat->sig[5] = (set->sig[2] >> 32); compat->sig[4] = set->sig[2]; case 2: compat->sig[3] = (set->sig[1] >> 32); compat->sig[2] = set->sig[1]; case 1: compat->sig[1] = (set->sig[0] >> 32); compat->sig[0] = set->sig[0]; } } |
28d27f2d2 switch compat_sys... |
956 957 958 |
COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese, struct compat_siginfo __user *, uinfo, struct compat_timespec __user *, uts, compat_size_t, sigsetsize) |
1da177e4c Linux-2.6.12-rc2 |
959 960 961 |
{ compat_sigset_t s32; sigset_t s; |
1da177e4c Linux-2.6.12-rc2 |
962 963 |
struct timespec t; siginfo_t info; |
943df1485 signal: introduce... |
964 |
long ret; |
1da177e4c Linux-2.6.12-rc2 |
965 966 967 968 969 970 971 |
if (sigsetsize != sizeof(sigset_t)) return -EINVAL; if (copy_from_user(&s32, uthese, sizeof(compat_sigset_t))) return -EFAULT; sigset_from_compat(&s, &s32); |
1da177e4c Linux-2.6.12-rc2 |
972 973 |
if (uts) { |
b2ddedcd2 x32: fix sigtimed... |
974 |
if (compat_get_timespec(&t, uts)) |
1da177e4c Linux-2.6.12-rc2 |
975 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
976 |
} |
943df1485 signal: introduce... |
977 |
ret = do_sigtimedwait(&s, &info, uts ? &t : NULL); |
1da177e4c Linux-2.6.12-rc2 |
978 |
|
943df1485 signal: introduce... |
979 980 981 |
if (ret > 0 && uinfo) { if (copy_siginfo_to_user32(uinfo, &info)) ret = -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
982 |
} |
943df1485 signal: introduce... |
983 |
|
1da177e4c Linux-2.6.12-rc2 |
984 |
return ret; |
62ab4505e signals: implemen... |
985 |
} |
1da177e4c Linux-2.6.12-rc2 |
986 987 988 |
#ifdef __ARCH_WANT_COMPAT_SYS_TIME /* compat_time_t is a 32 bit "long" and needs to get converted. */ |
62a6fa976 kernel/compat: co... |
989 |
COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) |
1da177e4c Linux-2.6.12-rc2 |
990 991 992 993 994 995 996 997 998 |
{ compat_time_t i; struct timeval tv; do_gettimeofday(&tv); i = tv.tv_sec; if (tloc) { if (put_user(i,tloc)) |
e3d5a27d5 Allow times and t... |
999 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1000 |
} |
e3d5a27d5 Allow times and t... |
1001 |
force_successful_syscall_return(); |
1da177e4c Linux-2.6.12-rc2 |
1002 1003 |
return i; } |
62a6fa976 kernel/compat: co... |
1004 |
COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) |
1da177e4c Linux-2.6.12-rc2 |
1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 |
{ struct timespec tv; int err; if (get_user(tv.tv_sec, tptr)) return -EFAULT; tv.tv_nsec = 0; err = security_settime(&tv, NULL); if (err) return err; do_settimeofday(&tv); return 0; } #endif /* __ARCH_WANT_COMPAT_SYS_TIME */ |
150256d8a [PATCH] Generic s... |
1023 |
|
62a6fa976 kernel/compat: co... |
1024 |
COMPAT_SYSCALL_DEFINE1(adjtimex, struct compat_timex __user *, utp) |
3158e9411 [PATCH] consolida... |
1025 1026 |
{ struct timex txc; |
65f5d80bd time: Splitout co... |
1027 |
int err, ret; |
3158e9411 [PATCH] consolida... |
1028 |
|
65f5d80bd time: Splitout co... |
1029 1030 1031 |
err = compat_get_timex(&txc, utp); if (err) return err; |
3158e9411 [PATCH] consolida... |
1032 1033 |
ret = do_adjtimex(&txc); |
65f5d80bd time: Splitout co... |
1034 1035 1036 |
err = compat_put_timex(utp, &txc); if (err) return err; |
3158e9411 [PATCH] consolida... |
1037 1038 1039 |
return ret; } |
1b2db9fb7 [PATCH] sys_move_... |
1040 1041 |
#ifdef CONFIG_NUMA |
2f2728f6d mm/compat: conver... |
1042 1043 1044 1045 1046 |
COMPAT_SYSCALL_DEFINE6(move_pages, pid_t, pid, compat_ulong_t, nr_pages, compat_uptr_t __user *, pages32, const int __user *, nodes, int __user *, status, int, flags) |
1b2db9fb7 [PATCH] sys_move_... |
1047 1048 1049 1050 1051 1052 1053 |
{ const void __user * __user *pages; int i; pages = compat_alloc_user_space(nr_pages * sizeof(void *)); for (i = 0; i < nr_pages; i++) { compat_uptr_t p; |
9216dfad4 [PATCH] move_page... |
1054 |
if (get_user(p, pages32 + i) || |
1b2db9fb7 [PATCH] sys_move_... |
1055 1056 1057 1058 1059 |
put_user(compat_ptr(p), pages + i)) return -EFAULT; } return sys_move_pages(pid, nr_pages, pages, nodes, status, flags); } |
3fd593979 [PATCH] Create co... |
1060 |
|
62a6fa976 kernel/compat: co... |
1061 1062 1063 1064 |
COMPAT_SYSCALL_DEFINE4(migrate_pages, compat_pid_t, pid, compat_ulong_t, maxnode, const compat_ulong_t __user *, old_nodes, const compat_ulong_t __user *, new_nodes) |
3fd593979 [PATCH] Create co... |
1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 |
{ unsigned long __user *old = NULL; unsigned long __user *new = NULL; nodemask_t tmp_mask; unsigned long nr_bits; unsigned long size; nr_bits = min_t(unsigned long, maxnode - 1, MAX_NUMNODES); size = ALIGN(nr_bits, BITS_PER_LONG) / 8; if (old_nodes) { if (compat_get_bitmap(nodes_addr(tmp_mask), old_nodes, nr_bits)) return -EFAULT; old = compat_alloc_user_space(new_nodes ? size * 2 : size); if (new_nodes) new = old + size / sizeof(unsigned long); if (copy_to_user(old, nodes_addr(tmp_mask), size)) return -EFAULT; } if (new_nodes) { if (compat_get_bitmap(nodes_addr(tmp_mask), new_nodes, nr_bits)) return -EFAULT; if (new == NULL) new = compat_alloc_user_space(size); if (copy_to_user(new, nodes_addr(tmp_mask), size)) return -EFAULT; } return sys_migrate_pages(pid, nr_bits + 1, old, new); } |
1b2db9fb7 [PATCH] sys_move_... |
1093 |
#endif |
d4d23add3 [PATCH] Common co... |
1094 |
|
6883da8c6 switch compat_sys... |
1095 1096 1097 |
COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval, compat_pid_t, pid, struct compat_timespec __user *, interval) |
0ad50c389 compat: generic c... |
1098 1099 1100 1101 1102 1103 1104 1105 |
{ struct timespec t; int ret; mm_segment_t old_fs = get_fs(); set_fs(KERNEL_DS); ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t); set_fs(old_fs); |
81993e81a compat: Get rid o... |
1106 |
if (compat_put_timespec(&t, interval)) |
0ad50c389 compat: generic c... |
1107 1108 1109 |
return -EFAULT; return ret; } |
0ad50c389 compat: generic c... |
1110 |
|
c41d68a51 compat: Make comp... |
1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 |
/* * Allocate user-space memory for the duration of a single system call, * in order to marshall parameters inside a compat thunk. */ void __user *compat_alloc_user_space(unsigned long len) { void __user *ptr; /* If len would occupy more than half of the entire compat space... */ if (unlikely(len > (((compat_uptr_t)~0) >> 1))) return NULL; ptr = arch_compat_alloc_user_space(len); if (unlikely(!access_ok(VERIFY_WRITE, ptr, len))) return NULL; return ptr; } EXPORT_SYMBOL_GPL(compat_alloc_user_space); |