Blame view
fs/compat.c
37 KB
1da177e4c Linux-2.6.12-rc2 |
1 2 3 4 5 6 7 8 9 10 |
/* * linux/fs/compat.c * * Kernel compatibililty routines for e.g. 32 bit syscall support * on 64 bit kernels. * * Copyright (C) 2002 Stephen Rothwell, IBM Corporation * Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com) * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) * Copyright (C) 2001,2002 Andi Kleen, SuSE Labs |
a2531293d update email address |
11 |
* Copyright (C) 2003 Pavel Machek (pavel@ucw.cz) |
1da177e4c Linux-2.6.12-rc2 |
12 13 14 15 16 |
* * 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. */ |
85c9fe8fc vfs: fix warning:... |
17 |
#include <linux/stddef.h> |
022a16924 ROUND_UP macro cl... |
18 |
#include <linux/kernel.h> |
1da177e4c Linux-2.6.12-rc2 |
19 20 21 22 23 24 25 26 |
#include <linux/linkage.h> #include <linux/compat.h> #include <linux/errno.h> #include <linux/time.h> #include <linux/fs.h> #include <linux/fcntl.h> #include <linux/namei.h> #include <linux/file.h> |
9f3acc314 [PATCH] split lin... |
27 |
#include <linux/fdtable.h> |
1da177e4c Linux-2.6.12-rc2 |
28 |
#include <linux/vfs.h> |
1da177e4c Linux-2.6.12-rc2 |
29 30 |
#include <linux/ioctl.h> #include <linux/init.h> |
1da177e4c Linux-2.6.12-rc2 |
31 |
#include <linux/ncp_mount.h> |
9a9947bf7 [PATCH] Add 32-bi... |
32 |
#include <linux/nfs4_mount.h> |
1da177e4c Linux-2.6.12-rc2 |
33 34 |
#include <linux/syscalls.h> #include <linux/ctype.h> |
1da177e4c Linux-2.6.12-rc2 |
35 |
#include <linux/dirent.h> |
0eeca2830 [PATCH] inotify |
36 |
#include <linux/fsnotify.h> |
1da177e4c Linux-2.6.12-rc2 |
37 |
#include <linux/highuid.h> |
1da177e4c Linux-2.6.12-rc2 |
38 39 |
#include <linux/personality.h> #include <linux/rwsem.h> |
8f0ab5147 [PATCH] csa: conv... |
40 |
#include <linux/tsacct_kern.h> |
6272e2667 cleanup compat io... |
41 |
#include <linux/security.h> |
a1f8e7f7f [PATCH] severing ... |
42 |
#include <linux/highmem.h> |
6d18c9220 signal/timer/even... |
43 |
#include <linux/signal.h> |
bd01f843c [PATCH] severing ... |
44 |
#include <linux/poll.h> |
4a805e863 [COMPAT]: Fixup c... |
45 |
#include <linux/mm.h> |
498052bba New locking/refco... |
46 |
#include <linux/fs_struct.h> |
5a0e3ad6a include cleanup: ... |
47 |
#include <linux/slab.h> |
504b701bb fs/compat.c: fix ... |
48 |
#include <linux/pagemap.h> |
a27bb332c aio: don't includ... |
49 |
#include <linux/aio.h> |
1da177e4c Linux-2.6.12-rc2 |
50 |
|
1da177e4c Linux-2.6.12-rc2 |
51 52 53 |
#include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/ioctls.h> |
07f3f05c1 [PATCH] BLOCK: Mo... |
54 |
#include "internal.h" |
9f72949f6 [PATCH] Add psele... |
55 |
|
bebfa1013 [PATCH] x86_64: A... |
56 57 58 59 60 61 62 63 64 65 66 67 68 |
int compat_log = 1; int compat_printk(const char *fmt, ...) { va_list ap; int ret; if (!compat_log) return 0; va_start(ap, fmt); ret = vprintk(fmt, ap); va_end(ap); return ret; } |
1da177e4c Linux-2.6.12-rc2 |
69 70 71 72 |
/* * Not all architectures have sys_utime, so implement this in terms * of sys_utimes. */ |
625b1d7e8 fs/compat: conver... |
73 74 |
COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename, struct compat_utimbuf __user *, t) |
1da177e4c Linux-2.6.12-rc2 |
75 |
{ |
1c710c896 utimensat impleme... |
76 |
struct timespec tv[2]; |
1da177e4c Linux-2.6.12-rc2 |
77 78 79 80 81 |
if (t) { if (get_user(tv[0].tv_sec, &t->actime) || get_user(tv[1].tv_sec, &t->modtime)) return -EFAULT; |
1c710c896 utimensat impleme... |
82 83 |
tv[0].tv_nsec = 0; tv[1].tv_nsec = 0; |
1da177e4c Linux-2.6.12-rc2 |
84 |
} |
1c710c896 utimensat impleme... |
85 86 |
return do_utimes(AT_FDCWD, filename, t ? tv : NULL, 0); } |
625b1d7e8 fs/compat: conver... |
87 |
COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filename, struct compat_timespec __user *, t, int, flags) |
1c710c896 utimensat impleme... |
88 89 90 91 |
{ struct timespec tv[2]; if (t) { |
81993e81a compat: Get rid o... |
92 93 |
if (compat_get_timespec(&tv[0], &t[0]) || compat_get_timespec(&tv[1], &t[1])) |
1c710c896 utimensat impleme... |
94 |
return -EFAULT; |
1c710c896 utimensat impleme... |
95 96 97 98 |
if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT) return 0; } return do_utimes(dfd, filename, t ? tv : NULL, flags); |
1da177e4c Linux-2.6.12-rc2 |
99 |
} |
625b1d7e8 fs/compat: conver... |
100 |
COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd, const char __user *, filename, struct compat_timeval __user *, t) |
1da177e4c Linux-2.6.12-rc2 |
101 |
{ |
1c710c896 utimensat impleme... |
102 |
struct timespec tv[2]; |
1da177e4c Linux-2.6.12-rc2 |
103 |
|
9ad11ab48 [PATCH] compat: f... |
104 |
if (t) { |
1da177e4c Linux-2.6.12-rc2 |
105 |
if (get_user(tv[0].tv_sec, &t[0].tv_sec) || |
1c710c896 utimensat impleme... |
106 |
get_user(tv[0].tv_nsec, &t[0].tv_usec) || |
1da177e4c Linux-2.6.12-rc2 |
107 |
get_user(tv[1].tv_sec, &t[1].tv_sec) || |
1c710c896 utimensat impleme... |
108 |
get_user(tv[1].tv_nsec, &t[1].tv_usec)) |
9ad11ab48 [PATCH] compat: f... |
109 |
return -EFAULT; |
1c710c896 utimensat impleme... |
110 111 112 113 114 |
if (tv[0].tv_nsec >= 1000000 || tv[0].tv_nsec < 0 || tv[1].tv_nsec >= 1000000 || tv[1].tv_nsec < 0) return -EINVAL; tv[0].tv_nsec *= 1000; tv[1].tv_nsec *= 1000; |
9ad11ab48 [PATCH] compat: f... |
115 |
} |
1c710c896 utimensat impleme... |
116 |
return do_utimes(dfd, filename, t ? tv : NULL, 0); |
5590ff0d5 [PATCH] vfs: *at ... |
117 |
} |
625b1d7e8 fs/compat: conver... |
118 |
COMPAT_SYSCALL_DEFINE2(utimes, const char __user *, filename, struct compat_timeval __user *, t) |
5590ff0d5 [PATCH] vfs: *at ... |
119 120 |
{ return compat_sys_futimesat(AT_FDCWD, filename, t); |
1da177e4c Linux-2.6.12-rc2 |
121 |
} |
f7a5000f7 compat: move cp_c... |
122 123 |
static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) { |
fcf83067b vfs: fix compat_s... |
124 |
struct compat_stat tmp; |
f7a5000f7 compat: move cp_c... |
125 |
|
fcf83067b vfs: fix compat_s... |
126 127 |
if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev)) return -EOVERFLOW; |
f7a5000f7 compat: move cp_c... |
128 |
|
fcf83067b vfs: fix compat_s... |
129 130 131 132 |
memset(&tmp, 0, sizeof(tmp)); tmp.st_dev = old_encode_dev(stat->dev); tmp.st_ino = stat->ino; if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino) |
f7a5000f7 compat: move cp_c... |
133 |
return -EOVERFLOW; |
fcf83067b vfs: fix compat_s... |
134 135 136 |
tmp.st_mode = stat->mode; tmp.st_nlink = stat->nlink; if (tmp.st_nlink != stat->nlink) |
f7a5000f7 compat: move cp_c... |
137 |
return -EOVERFLOW; |
a7c1938e2 userns: Convert s... |
138 139 |
SET_UID(tmp.st_uid, from_kuid_munged(current_user_ns(), stat->uid)); SET_GID(tmp.st_gid, from_kgid_munged(current_user_ns(), stat->gid)); |
fcf83067b vfs: fix compat_s... |
140 141 142 143 144 145 146 147 148 149 150 151 152 |
tmp.st_rdev = old_encode_dev(stat->rdev); if ((u64) stat->size > MAX_NON_LFS) return -EOVERFLOW; tmp.st_size = stat->size; tmp.st_atime = stat->atime.tv_sec; tmp.st_atime_nsec = stat->atime.tv_nsec; tmp.st_mtime = stat->mtime.tv_sec; tmp.st_mtime_nsec = stat->mtime.tv_nsec; tmp.st_ctime = stat->ctime.tv_sec; tmp.st_ctime_nsec = stat->ctime.tv_nsec; tmp.st_blocks = stat->blocks; tmp.st_blksize = stat->blksize; return copy_to_user(ubuf, &tmp, sizeof(tmp)) ? -EFAULT : 0; |
f7a5000f7 compat: move cp_c... |
153 |
} |
625b1d7e8 fs/compat: conver... |
154 155 |
COMPAT_SYSCALL_DEFINE2(newstat, const char __user *, filename, struct compat_stat __user *, statbuf) |
1da177e4c Linux-2.6.12-rc2 |
156 157 |
{ struct kstat stat; |
2eae7a187 kill vfs_stat_fd ... |
158 |
int error; |
1da177e4c Linux-2.6.12-rc2 |
159 |
|
2eae7a187 kill vfs_stat_fd ... |
160 161 162 163 |
error = vfs_stat(filename, &stat); if (error) return error; return cp_compat_stat(&stat, statbuf); |
1da177e4c Linux-2.6.12-rc2 |
164 |
} |
625b1d7e8 fs/compat: conver... |
165 166 |
COMPAT_SYSCALL_DEFINE2(newlstat, const char __user *, filename, struct compat_stat __user *, statbuf) |
1da177e4c Linux-2.6.12-rc2 |
167 168 |
{ struct kstat stat; |
2eae7a187 kill vfs_stat_fd ... |
169 |
int error; |
1da177e4c Linux-2.6.12-rc2 |
170 |
|
2eae7a187 kill vfs_stat_fd ... |
171 172 173 174 |
error = vfs_lstat(filename, &stat); if (error) return error; return cp_compat_stat(&stat, statbuf); |
1da177e4c Linux-2.6.12-rc2 |
175 |
} |
82d821ddc [PATCH] Condition... |
176 |
#ifndef __ARCH_WANT_STAT64 |
625b1d7e8 fs/compat: conver... |
177 178 179 |
COMPAT_SYSCALL_DEFINE4(newfstatat, unsigned int, dfd, const char __user *, filename, struct compat_stat __user *, statbuf, int, flag) |
5590ff0d5 [PATCH] vfs: *at ... |
180 181 |
{ struct kstat stat; |
0112fc222 Separate out comm... |
182 |
int error; |
5590ff0d5 [PATCH] vfs: *at ... |
183 |
|
0112fc222 Separate out comm... |
184 185 186 187 |
error = vfs_fstatat(dfd, filename, &stat, flag); if (error) return error; return cp_compat_stat(&stat, statbuf); |
5590ff0d5 [PATCH] vfs: *at ... |
188 |
} |
82d821ddc [PATCH] Condition... |
189 |
#endif |
5590ff0d5 [PATCH] vfs: *at ... |
190 |
|
625b1d7e8 fs/compat: conver... |
191 192 |
COMPAT_SYSCALL_DEFINE2(newfstat, unsigned int, fd, struct compat_stat __user *, statbuf) |
1da177e4c Linux-2.6.12-rc2 |
193 194 195 196 197 198 199 200 201 202 203 204 205 |
{ struct kstat stat; int error = vfs_fstat(fd, &stat); if (!error) error = cp_compat_stat(&stat, statbuf); return error; } static int put_compat_statfs(struct compat_statfs __user *ubuf, struct kstatfs *kbuf) { if (sizeof ubuf->f_blocks == 4) { |
f4a67ccee fs: check for sta... |
206 207 |
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail | kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL) |
1da177e4c Linux-2.6.12-rc2 |
208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 |
return -EOVERFLOW; /* f_files and f_ffree may be -1; it's okay * to stuff that into 32 bits */ if (kbuf->f_files != 0xffffffffffffffffULL && (kbuf->f_files & 0xffffffff00000000ULL)) return -EOVERFLOW; if (kbuf->f_ffree != 0xffffffffffffffffULL && (kbuf->f_ffree & 0xffffffff00000000ULL)) return -EOVERFLOW; } if (!access_ok(VERIFY_WRITE, ubuf, sizeof(*ubuf)) || __put_user(kbuf->f_type, &ubuf->f_type) || __put_user(kbuf->f_bsize, &ubuf->f_bsize) || __put_user(kbuf->f_blocks, &ubuf->f_blocks) || __put_user(kbuf->f_bfree, &ubuf->f_bfree) || __put_user(kbuf->f_bavail, &ubuf->f_bavail) || __put_user(kbuf->f_files, &ubuf->f_files) || __put_user(kbuf->f_ffree, &ubuf->f_ffree) || __put_user(kbuf->f_namelen, &ubuf->f_namelen) || __put_user(kbuf->f_fsid.val[0], &ubuf->f_fsid.val[0]) || __put_user(kbuf->f_fsid.val[1], &ubuf->f_fsid.val[1]) || __put_user(kbuf->f_frsize, &ubuf->f_frsize) || |
1448c721e compat: sync comp... |
230 231 |
__put_user(kbuf->f_flags, &ubuf->f_flags) || __clear_user(ubuf->f_spare, sizeof(ubuf->f_spare))) |
1da177e4c Linux-2.6.12-rc2 |
232 233 234 235 236 |
return -EFAULT; return 0; } /* |
974d879e8 compat: update co... |
237 |
* The following statfs calls are copies of code from fs/statfs.c and |
1da177e4c Linux-2.6.12-rc2 |
238 239 |
* should be checked against those from time to time */ |
625b1d7e8 fs/compat: conver... |
240 |
COMPAT_SYSCALL_DEFINE2(statfs, const char __user *, pathname, struct compat_statfs __user *, buf) |
1da177e4c Linux-2.6.12-rc2 |
241 |
{ |
c8b91accf clean statfs-like... |
242 243 244 245 |
struct kstatfs tmp; int error = user_statfs(pathname, &tmp); if (!error) error = put_compat_statfs(buf, &tmp); |
1da177e4c Linux-2.6.12-rc2 |
246 247 |
return error; } |
625b1d7e8 fs/compat: conver... |
248 |
COMPAT_SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct compat_statfs __user *, buf) |
1da177e4c Linux-2.6.12-rc2 |
249 |
{ |
1da177e4c Linux-2.6.12-rc2 |
250 |
struct kstatfs tmp; |
c8b91accf clean statfs-like... |
251 |
int error = fd_statfs(fd, &tmp); |
86e07ce71 [PATCH] Fix error... |
252 253 |
if (!error) error = put_compat_statfs(buf, &tmp); |
1da177e4c Linux-2.6.12-rc2 |
254 255 256 257 258 259 |
return error; } static int put_compat_statfs64(struct compat_statfs64 __user *ubuf, struct kstatfs *kbuf) { if (sizeof ubuf->f_blocks == 4) { |
f4a67ccee fs: check for sta... |
260 261 |
if ((kbuf->f_blocks | kbuf->f_bfree | kbuf->f_bavail | kbuf->f_bsize | kbuf->f_frsize) & 0xffffffff00000000ULL) |
1da177e4c Linux-2.6.12-rc2 |
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
return -EOVERFLOW; /* f_files and f_ffree may be -1; it's okay * to stuff that into 32 bits */ if (kbuf->f_files != 0xffffffffffffffffULL && (kbuf->f_files & 0xffffffff00000000ULL)) return -EOVERFLOW; if (kbuf->f_ffree != 0xffffffffffffffffULL && (kbuf->f_ffree & 0xffffffff00000000ULL)) return -EOVERFLOW; } if (!access_ok(VERIFY_WRITE, ubuf, sizeof(*ubuf)) || __put_user(kbuf->f_type, &ubuf->f_type) || __put_user(kbuf->f_bsize, &ubuf->f_bsize) || __put_user(kbuf->f_blocks, &ubuf->f_blocks) || __put_user(kbuf->f_bfree, &ubuf->f_bfree) || __put_user(kbuf->f_bavail, &ubuf->f_bavail) || __put_user(kbuf->f_files, &ubuf->f_files) || __put_user(kbuf->f_ffree, &ubuf->f_ffree) || __put_user(kbuf->f_namelen, &ubuf->f_namelen) || __put_user(kbuf->f_fsid.val[0], &ubuf->f_fsid.val[0]) || __put_user(kbuf->f_fsid.val[1], &ubuf->f_fsid.val[1]) || |
e0bb6bda4 compat: copy miss... |
283 284 285 |
__put_user(kbuf->f_frsize, &ubuf->f_frsize) || __put_user(kbuf->f_flags, &ubuf->f_flags) || __clear_user(ubuf->f_spare, sizeof(ubuf->f_spare))) |
1da177e4c Linux-2.6.12-rc2 |
286 287 288 |
return -EFAULT; return 0; } |
625b1d7e8 fs/compat: conver... |
289 |
COMPAT_SYSCALL_DEFINE3(statfs64, const char __user *, pathname, compat_size_t, sz, struct compat_statfs64 __user *, buf) |
1da177e4c Linux-2.6.12-rc2 |
290 |
{ |
c8b91accf clean statfs-like... |
291 |
struct kstatfs tmp; |
1da177e4c Linux-2.6.12-rc2 |
292 293 294 295 |
int error; if (sz != sizeof(*buf)) return -EINVAL; |
c8b91accf clean statfs-like... |
296 297 298 |
error = user_statfs(pathname, &tmp); if (!error) error = put_compat_statfs64(buf, &tmp); |
1da177e4c Linux-2.6.12-rc2 |
299 300 |
return error; } |
625b1d7e8 fs/compat: conver... |
301 |
COMPAT_SYSCALL_DEFINE3(fstatfs64, unsigned int, fd, compat_size_t, sz, struct compat_statfs64 __user *, buf) |
1da177e4c Linux-2.6.12-rc2 |
302 |
{ |
1da177e4c Linux-2.6.12-rc2 |
303 304 305 306 307 |
struct kstatfs tmp; int error; if (sz != sizeof(*buf)) return -EINVAL; |
c8b91accf clean statfs-like... |
308 |
error = fd_statfs(fd, &tmp); |
86e07ce71 [PATCH] Fix error... |
309 310 |
if (!error) error = put_compat_statfs64(buf, &tmp); |
1da177e4c Linux-2.6.12-rc2 |
311 312 |
return error; } |
2b1c6bd77 generic compat_sy... |
313 314 315 316 317 |
/* * This is a copy of sys_ustat, just dealing with a structure layout. * Given how simple this syscall is that apporach is more maintainable * than the various conversion hacks. */ |
625b1d7e8 fs/compat: conver... |
318 |
COMPAT_SYSCALL_DEFINE2(ustat, unsigned, dev, struct compat_ustat __user *, u) |
2b1c6bd77 generic compat_sy... |
319 |
{ |
2b1c6bd77 generic compat_sy... |
320 321 |
struct compat_ustat tmp; struct kstatfs sbuf; |
cf31e70d6 vfs: new helper -... |
322 |
int err = vfs_ustat(new_decode_dev(dev), &sbuf); |
2b1c6bd77 generic compat_sy... |
323 324 325 326 327 328 329 330 331 332 |
if (err) return err; memset(&tmp, 0, sizeof(struct compat_ustat)); tmp.f_tfree = sbuf.f_bfree; tmp.f_tinode = sbuf.f_ffree; if (copy_to_user(u, &tmp, sizeof(struct compat_ustat))) return -EFAULT; return 0; } |
1da177e4c Linux-2.6.12-rc2 |
333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
static int get_compat_flock(struct flock *kfl, struct compat_flock __user *ufl) { if (!access_ok(VERIFY_READ, ufl, sizeof(*ufl)) || __get_user(kfl->l_type, &ufl->l_type) || __get_user(kfl->l_whence, &ufl->l_whence) || __get_user(kfl->l_start, &ufl->l_start) || __get_user(kfl->l_len, &ufl->l_len) || __get_user(kfl->l_pid, &ufl->l_pid)) return -EFAULT; return 0; } static int put_compat_flock(struct flock *kfl, struct compat_flock __user *ufl) { if (!access_ok(VERIFY_WRITE, ufl, sizeof(*ufl)) || __put_user(kfl->l_type, &ufl->l_type) || __put_user(kfl->l_whence, &ufl->l_whence) || __put_user(kfl->l_start, &ufl->l_start) || __put_user(kfl->l_len, &ufl->l_len) || __put_user(kfl->l_pid, &ufl->l_pid)) return -EFAULT; return 0; } #ifndef HAVE_ARCH_GET_COMPAT_FLOCK64 static int get_compat_flock64(struct flock *kfl, struct compat_flock64 __user *ufl) { if (!access_ok(VERIFY_READ, ufl, sizeof(*ufl)) || __get_user(kfl->l_type, &ufl->l_type) || __get_user(kfl->l_whence, &ufl->l_whence) || __get_user(kfl->l_start, &ufl->l_start) || __get_user(kfl->l_len, &ufl->l_len) || __get_user(kfl->l_pid, &ufl->l_pid)) return -EFAULT; return 0; } #endif #ifndef HAVE_ARCH_PUT_COMPAT_FLOCK64 static int put_compat_flock64(struct flock *kfl, struct compat_flock64 __user *ufl) { if (!access_ok(VERIFY_WRITE, ufl, sizeof(*ufl)) || __put_user(kfl->l_type, &ufl->l_type) || __put_user(kfl->l_whence, &ufl->l_whence) || __put_user(kfl->l_start, &ufl->l_start) || __put_user(kfl->l_len, &ufl->l_len) || __put_user(kfl->l_pid, &ufl->l_pid)) return -EFAULT; return 0; } #endif |
5d50ffd7c locks: add new fc... |
384 385 386 387 388 389 390 391 392 393 394 395 396 397 |
static unsigned int convert_fcntl_cmd(unsigned int cmd) { switch (cmd) { case F_GETLK64: return F_GETLK; case F_SETLK64: return F_SETLK; case F_SETLKW64: return F_SETLKW; } return cmd; } |
932602e23 fs/compat: conver... |
398 399 |
COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd, compat_ulong_t, arg) |
1da177e4c Linux-2.6.12-rc2 |
400 401 402 403 |
{ mm_segment_t old_fs; struct flock f; long ret; |
5d50ffd7c locks: add new fc... |
404 |
unsigned int conv_cmd; |
1da177e4c Linux-2.6.12-rc2 |
405 406 407 408 409 410 411 412 413 414 415 416 417 |
switch (cmd) { case F_GETLK: case F_SETLK: case F_SETLKW: ret = get_compat_flock(&f, compat_ptr(arg)); if (ret != 0) break; old_fs = get_fs(); set_fs(KERNEL_DS); ret = sys_fcntl(fd, cmd, (unsigned long)&f); set_fs(old_fs); if (cmd == F_GETLK && ret == 0) { |
ff677f8d1 trivial: fix comm... |
418 |
/* GETLK was successful and we need to return the data... |
2520f14ca [PATCH] Fix overf... |
419 420 421 422 423 424 425 426 427 428 429 |
* but it needs to fit in the compat structure. * l_start shouldn't be too big, unless the original * start + end is greater than COMPAT_OFF_T_MAX, in which * case the app was asking for trouble, so we return * -EOVERFLOW in that case. * l_len could be too big, in which case we just truncate it, * and only allow the app to see that part of the conflicting * lock that might make sense to it anyway */ if (f.l_start > COMPAT_OFF_T_MAX) |
1da177e4c Linux-2.6.12-rc2 |
430 |
ret = -EOVERFLOW; |
2520f14ca [PATCH] Fix overf... |
431 432 |
if (f.l_len > COMPAT_OFF_T_MAX) f.l_len = COMPAT_OFF_T_MAX; |
1da177e4c Linux-2.6.12-rc2 |
433 434 435 436 437 438 439 440 |
if (ret == 0) ret = put_compat_flock(&f, compat_ptr(arg)); } break; case F_GETLK64: case F_SETLK64: case F_SETLKW64: |
0d3f7a2dd locks: rename fil... |
441 442 443 |
case F_OFD_GETLK: case F_OFD_SETLK: case F_OFD_SETLKW: |
1da177e4c Linux-2.6.12-rc2 |
444 445 446 447 448 |
ret = get_compat_flock64(&f, compat_ptr(arg)); if (ret != 0) break; old_fs = get_fs(); set_fs(KERNEL_DS); |
5d50ffd7c locks: add new fc... |
449 450 |
conv_cmd = convert_fcntl_cmd(cmd); ret = sys_fcntl(fd, conv_cmd, (unsigned long)&f); |
1da177e4c Linux-2.6.12-rc2 |
451 |
set_fs(old_fs); |
0d3f7a2dd locks: rename fil... |
452 |
if ((conv_cmd == F_GETLK || conv_cmd == F_OFD_GETLK) && ret == 0) { |
2520f14ca [PATCH] Fix overf... |
453 454 |
/* need to return lock information - see above for commentary */ if (f.l_start > COMPAT_LOFF_T_MAX) |
1da177e4c Linux-2.6.12-rc2 |
455 |
ret = -EOVERFLOW; |
2520f14ca [PATCH] Fix overf... |
456 457 |
if (f.l_len > COMPAT_LOFF_T_MAX) f.l_len = COMPAT_LOFF_T_MAX; |
1da177e4c Linux-2.6.12-rc2 |
458 459 460 461 462 463 464 465 466 467 468 |
if (ret == 0) ret = put_compat_flock64(&f, compat_ptr(arg)); } break; default: ret = sys_fcntl(fd, cmd, arg); break; } return ret; } |
932602e23 fs/compat: conver... |
469 470 |
COMPAT_SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, compat_ulong_t, arg) |
1da177e4c Linux-2.6.12-rc2 |
471 |
{ |
5d50ffd7c locks: add new fc... |
472 473 474 475 |
switch (cmd) { case F_GETLK64: case F_SETLK64: case F_SETLKW64: |
0d3f7a2dd locks: rename fil... |
476 477 478 |
case F_OFD_GETLK: case F_OFD_SETLK: case F_OFD_SETLKW: |
1da177e4c Linux-2.6.12-rc2 |
479 |
return -EINVAL; |
5d50ffd7c locks: add new fc... |
480 |
} |
1da177e4c Linux-2.6.12-rc2 |
481 482 |
return compat_sys_fcntl64(fd, cmd, arg); } |
625b1d7e8 fs/compat: conver... |
483 |
COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p) |
1da177e4c Linux-2.6.12-rc2 |
484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 |
{ long ret; aio_context_t ctx64; mm_segment_t oldfs = get_fs(); if (unlikely(get_user(ctx64, ctx32p))) return -EFAULT; set_fs(KERNEL_DS); /* The __user pointer cast is valid because of the set_fs() */ ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64); set_fs(oldfs); /* truncating is ok because it's a user address */ if (!ret) ret = put_user((u32) ctx64, ctx32p); return ret; } |
932602e23 fs/compat: conver... |
501 502 503 504 505 |
COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, compat_long_t, min_nr, compat_long_t, nr, struct io_event __user *, events, struct compat_timespec __user *, timeout) |
1da177e4c Linux-2.6.12-rc2 |
506 |
{ |
1da177e4c Linux-2.6.12-rc2 |
507 508 |
struct timespec t; struct timespec __user *ut = NULL; |
1da177e4c Linux-2.6.12-rc2 |
509 |
if (timeout) { |
81993e81a compat: Get rid o... |
510 |
if (compat_get_timespec(&t, timeout)) |
932602e23 fs/compat: conver... |
511 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
512 513 514 |
ut = compat_alloc_user_space(sizeof(*ut)); if (copy_to_user(ut, &t, sizeof(t)) ) |
932602e23 fs/compat: conver... |
515 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
516 |
} |
932602e23 fs/compat: conver... |
517 |
return sys_io_getevents(ctx_id, min_nr, nr, events, ut); |
1da177e4c Linux-2.6.12-rc2 |
518 |
} |
b83733639 compat: factor ou... |
519 520 521 522 523 524 |
/* A write operation does a read from user space and vice versa */ #define vrfy_dir(type) ((type) == READ ? VERIFY_WRITE : VERIFY_READ) ssize_t compat_rw_copy_check_uvector(int type, const struct compat_iovec __user *uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, |
ac34ebb3a aio/vfs: cleanup ... |
525 |
struct iovec **ret_pointer) |
b83733639 compat: factor ou... |
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 |
{ compat_ssize_t tot_len; struct iovec *iov = *ret_pointer = fast_pointer; ssize_t ret = 0; int seg; /* * SuS says "The readv() function *may* fail if the iovcnt argument * was less than or equal to 0, or greater than {IOV_MAX}. Linux has * traditionally returned zero for zero segments, so... */ if (nr_segs == 0) goto out; ret = -EINVAL; if (nr_segs > UIO_MAXIOV || nr_segs < 0) goto out; if (nr_segs > fast_segs) { ret = -ENOMEM; iov = kmalloc(nr_segs*sizeof(struct iovec), GFP_KERNEL); |
6a5640f10 compat: remove un... |
546 |
if (iov == NULL) |
b83733639 compat: factor ou... |
547 |
goto out; |
b83733639 compat: factor ou... |
548 549 |
} *ret_pointer = iov; |
8aec0f5d4 Fix: compat_rw_co... |
550 551 552 |
ret = -EFAULT; if (!access_ok(VERIFY_READ, uvector, nr_segs*sizeof(*uvector))) goto out; |
b83733639 compat: factor ou... |
553 554 555 |
/* * Single unix specification: * We should -EINVAL if an element length is not >= 0 and fitting an |
435f49a51 readv/writev: do ... |
556 |
* ssize_t. |
b83733639 compat: factor ou... |
557 |
* |
435f49a51 readv/writev: do ... |
558 559 |
* In Linux, the total length is limited to MAX_RW_COUNT, there is * no overflow possibility. |
b83733639 compat: factor ou... |
560 561 562 563 |
*/ tot_len = 0; ret = -EINVAL; for (seg = 0; seg < nr_segs; seg++) { |
b83733639 compat: factor ou... |
564 565 566 567 568 569 570 571 572 573 |
compat_uptr_t buf; compat_ssize_t len; if (__get_user(len, &uvector->iov_len) || __get_user(buf, &uvector->iov_base)) { ret = -EFAULT; goto out; } if (len < 0) /* size_t not fitting in compat_ssize_t .. */ goto out; |
ac34ebb3a aio/vfs: cleanup ... |
574 |
if (type >= 0 && |
fcf634098 Cross Memory Attach |
575 |
!access_ok(vrfy_dir(type), compat_ptr(buf), len)) { |
b83733639 compat: factor ou... |
576 577 578 |
ret = -EFAULT; goto out; } |
435f49a51 readv/writev: do ... |
579 580 581 |
if (len > MAX_RW_COUNT - tot_len) len = MAX_RW_COUNT - tot_len; tot_len += len; |
b83733639 compat: factor ou... |
582 583 584 585 586 587 588 589 590 591 |
iov->iov_base = compat_ptr(buf); iov->iov_len = (compat_size_t) len; uvector++; iov++; } ret = tot_len; out: return ret; } |
1da177e4c Linux-2.6.12-rc2 |
592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 |
static inline long copy_iocb(long nr, u32 __user *ptr32, struct iocb __user * __user *ptr64) { compat_uptr_t uptr; int i; for (i = 0; i < nr; ++i) { if (get_user(uptr, ptr32 + i)) return -EFAULT; if (put_user(compat_ptr(uptr), ptr64 + i)) return -EFAULT; } return 0; } #define MAX_AIO_SUBMITS (PAGE_SIZE/sizeof(struct iocb *)) |
932602e23 fs/compat: conver... |
608 609 |
COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id, int, nr, u32 __user *, iocb) |
1da177e4c Linux-2.6.12-rc2 |
610 611 612 613 614 615 616 617 618 619 620 621 622 |
{ struct iocb __user * __user *iocb64; long ret; if (unlikely(nr < 0)) return -EINVAL; if (nr > MAX_AIO_SUBMITS) nr = MAX_AIO_SUBMITS; iocb64 = compat_alloc_user_space(nr * sizeof(*iocb64)); ret = copy_iocb(nr, iocb, iocb64); if (!ret) |
9d85cba71 aio: fix the comp... |
623 |
ret = do_io_submit(ctx_id, nr, iocb64, 1); |
1da177e4c Linux-2.6.12-rc2 |
624 625 626 627 628 629 |
return ret; } struct compat_ncp_mount_data { compat_int_t version; compat_uint_t ncp_fd; |
202e5979a [PATCH] compat: b... |
630 |
__compat_uid_t mounted_uid; |
1da177e4c Linux-2.6.12-rc2 |
631 632 633 634 635 |
compat_pid_t wdog_pid; unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; compat_uint_t time_out; compat_uint_t retry_count; compat_uint_t flags; |
202e5979a [PATCH] compat: b... |
636 637 |
__compat_uid_t uid; __compat_gid_t gid; |
1da177e4c Linux-2.6.12-rc2 |
638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 |
compat_mode_t file_mode; compat_mode_t dir_mode; }; struct compat_ncp_mount_data_v4 { compat_int_t version; compat_ulong_t flags; compat_ulong_t mounted_uid; compat_long_t wdog_pid; compat_uint_t ncp_fd; compat_uint_t time_out; compat_uint_t retry_count; compat_ulong_t uid; compat_ulong_t gid; compat_ulong_t file_mode; compat_ulong_t dir_mode; }; static void *do_ncp_super_data_conv(void *raw_data) { int version = *(unsigned int *)raw_data; if (version == 3) { struct compat_ncp_mount_data *c_n = raw_data; struct ncp_mount_data *n = raw_data; n->dir_mode = c_n->dir_mode; n->file_mode = c_n->file_mode; n->gid = c_n->gid; n->uid = c_n->uid; memmove (n->mounted_vol, c_n->mounted_vol, (sizeof (c_n->mounted_vol) + 3 * sizeof (unsigned int))); n->wdog_pid = c_n->wdog_pid; n->mounted_uid = c_n->mounted_uid; } else if (version == 4) { struct compat_ncp_mount_data_v4 *c_n = raw_data; struct ncp_mount_data_v4 *n = raw_data; n->dir_mode = c_n->dir_mode; n->file_mode = c_n->file_mode; n->gid = c_n->gid; n->uid = c_n->uid; n->retry_count = c_n->retry_count; n->time_out = c_n->time_out; n->ncp_fd = c_n->ncp_fd; n->wdog_pid = c_n->wdog_pid; n->mounted_uid = c_n->mounted_uid; n->flags = c_n->flags; } else if (version != 5) { return NULL; } return raw_data; } |
1da177e4c Linux-2.6.12-rc2 |
691 |
|
9a9947bf7 [PATCH] Add 32-bi... |
692 693 |
struct compat_nfs_string { compat_uint_t len; |
5fc3e624a [PATCH] NFS4: Don... |
694 |
compat_uptr_t data; |
9a9947bf7 [PATCH] Add 32-bi... |
695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 |
}; static inline void compat_nfs_string(struct nfs_string *dst, struct compat_nfs_string *src) { dst->data = compat_ptr(src->data); dst->len = src->len; } struct compat_nfs4_mount_data_v1 { compat_int_t version; compat_int_t flags; compat_int_t rsize; compat_int_t wsize; compat_int_t timeo; compat_int_t retrans; compat_int_t acregmin; compat_int_t acregmax; compat_int_t acdirmin; compat_int_t acdirmax; struct compat_nfs_string client_addr; struct compat_nfs_string mnt_path; struct compat_nfs_string hostname; compat_uint_t host_addrlen; |
5fc3e624a [PATCH] NFS4: Don... |
719 |
compat_uptr_t host_addr; |
9a9947bf7 [PATCH] Add 32-bi... |
720 721 |
compat_int_t proto; compat_int_t auth_flavourlen; |
5fc3e624a [PATCH] NFS4: Don... |
722 |
compat_uptr_t auth_flavours; |
9a9947bf7 [PATCH] Add 32-bi... |
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 |
}; static int do_nfs4_super_data_conv(void *raw_data) { int version = *(compat_uint_t *) raw_data; if (version == 1) { struct compat_nfs4_mount_data_v1 *raw = raw_data; struct nfs4_mount_data *real = raw_data; /* copy the fields backwards */ real->auth_flavours = compat_ptr(raw->auth_flavours); real->auth_flavourlen = raw->auth_flavourlen; real->proto = raw->proto; real->host_addr = compat_ptr(raw->host_addr); real->host_addrlen = raw->host_addrlen; compat_nfs_string(&real->hostname, &raw->hostname); compat_nfs_string(&real->mnt_path, &raw->mnt_path); compat_nfs_string(&real->client_addr, &raw->client_addr); real->acdirmax = raw->acdirmax; real->acdirmin = raw->acdirmin; real->acregmax = raw->acregmax; real->acregmin = raw->acregmin; real->retrans = raw->retrans; real->timeo = raw->timeo; real->wsize = raw->wsize; real->rsize = raw->rsize; real->flags = raw->flags; real->version = raw->version; } |
9a9947bf7 [PATCH] Add 32-bi... |
753 754 755 |
return 0; } |
1da177e4c Linux-2.6.12-rc2 |
756 |
#define NCPFS_NAME "ncpfs" |
9a9947bf7 [PATCH] Add 32-bi... |
757 |
#define NFS4_NAME "nfs4" |
1da177e4c Linux-2.6.12-rc2 |
758 |
|
932602e23 fs/compat: conver... |
759 760 761 762 |
COMPAT_SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name, const char __user *, type, compat_ulong_t, flags, const void __user *, data) |
1da177e4c Linux-2.6.12-rc2 |
763 |
{ |
eca6f534e fs: fix overflow ... |
764 |
char *kernel_type; |
1da177e4c Linux-2.6.12-rc2 |
765 |
unsigned long data_page; |
eca6f534e fs: fix overflow ... |
766 |
char *kernel_dev; |
91a27b2a7 vfs: define struc... |
767 |
struct filename *dir; |
1da177e4c Linux-2.6.12-rc2 |
768 |
int retval; |
eca6f534e fs: fix overflow ... |
769 |
retval = copy_mount_string(type, &kernel_type); |
1da177e4c Linux-2.6.12-rc2 |
770 771 |
if (retval < 0) goto out; |
91a27b2a7 vfs: define struc... |
772 773 774 |
dir = getname(dir_name); retval = PTR_ERR(dir); if (IS_ERR(dir)) |
1da177e4c Linux-2.6.12-rc2 |
775 |
goto out1; |
eca6f534e fs: fix overflow ... |
776 |
retval = copy_mount_string(dev_name, &kernel_dev); |
1da177e4c Linux-2.6.12-rc2 |
777 778 |
if (retval < 0) goto out2; |
eca6f534e fs: fix overflow ... |
779 |
retval = copy_mount_options(data, &data_page); |
1da177e4c Linux-2.6.12-rc2 |
780 781 782 783 |
if (retval < 0) goto out3; retval = -EINVAL; |
eca6f534e fs: fix overflow ... |
784 |
if (kernel_type && data_page) { |
2116b7a47 smbfs: move to dr... |
785 |
if (!strcmp(kernel_type, NCPFS_NAME)) { |
1da177e4c Linux-2.6.12-rc2 |
786 |
do_ncp_super_data_conv((void *)data_page); |
eca6f534e fs: fix overflow ... |
787 |
} else if (!strcmp(kernel_type, NFS4_NAME)) { |
9a9947bf7 [PATCH] Add 32-bi... |
788 789 |
if (do_nfs4_super_data_conv((void *) data_page)) goto out4; |
1da177e4c Linux-2.6.12-rc2 |
790 791 |
} } |
91a27b2a7 vfs: define struc... |
792 |
retval = do_mount(kernel_dev, dir->name, kernel_type, |
1da177e4c Linux-2.6.12-rc2 |
793 |
flags, (void*)data_page); |
1da177e4c Linux-2.6.12-rc2 |
794 |
|
9a9947bf7 [PATCH] Add 32-bi... |
795 |
out4: |
1da177e4c Linux-2.6.12-rc2 |
796 797 |
free_page(data_page); out3: |
eca6f534e fs: fix overflow ... |
798 |
kfree(kernel_dev); |
1da177e4c Linux-2.6.12-rc2 |
799 |
out2: |
91a27b2a7 vfs: define struc... |
800 |
putname(dir); |
1da177e4c Linux-2.6.12-rc2 |
801 |
out1: |
eca6f534e fs: fix overflow ... |
802 |
kfree(kernel_type); |
1da177e4c Linux-2.6.12-rc2 |
803 804 805 |
out: return retval; } |
1da177e4c Linux-2.6.12-rc2 |
806 807 808 809 810 811 812 813 |
struct compat_old_linux_dirent { compat_ulong_t d_ino; compat_ulong_t d_offset; unsigned short d_namlen; char d_name[1]; }; struct compat_readdir_callback { |
5c0ba4e07 [readdir] introdu... |
814 |
struct dir_context ctx; |
1da177e4c Linux-2.6.12-rc2 |
815 816 817 818 819 |
struct compat_old_linux_dirent __user *dirent; int result; }; static int compat_fillonedir(void *__buf, const char *name, int namlen, |
afefdbb28 [PATCH] VFS: Make... |
820 |
loff_t offset, u64 ino, unsigned int d_type) |
1da177e4c Linux-2.6.12-rc2 |
821 822 823 |
{ struct compat_readdir_callback *buf = __buf; struct compat_old_linux_dirent __user *dirent; |
afefdbb28 [PATCH] VFS: Make... |
824 |
compat_ulong_t d_ino; |
1da177e4c Linux-2.6.12-rc2 |
825 826 827 |
if (buf->result) return -EINVAL; |
afefdbb28 [PATCH] VFS: Make... |
828 |
d_ino = ino; |
8f3f655da [PATCH] fix regul... |
829 830 |
if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { buf->result = -EOVERFLOW; |
afefdbb28 [PATCH] VFS: Make... |
831 |
return -EOVERFLOW; |
8f3f655da [PATCH] fix regul... |
832 |
} |
1da177e4c Linux-2.6.12-rc2 |
833 834 835 836 837 838 |
buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, (unsigned long)(dirent->d_name + namlen + 1) - (unsigned long)dirent)) goto efault; |
afefdbb28 [PATCH] VFS: Make... |
839 |
if ( __put_user(d_ino, &dirent->d_ino) || |
1da177e4c Linux-2.6.12-rc2 |
840 841 842 843 844 845 846 847 848 849 |
__put_user(offset, &dirent->d_offset) || __put_user(namlen, &dirent->d_namlen) || __copy_to_user(dirent->d_name, name, namlen) || __put_user(0, dirent->d_name + namlen)) goto efault; return 0; efault: buf->result = -EFAULT; return -EFAULT; } |
625b1d7e8 fs/compat: conver... |
850 851 |
COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd, struct compat_old_linux_dirent __user *, dirent, unsigned int, count) |
1da177e4c Linux-2.6.12-rc2 |
852 853 |
{ int error; |
2903ff019 switch simple cas... |
854 |
struct fd f = fdget(fd); |
ac6614b76 [readdir] constif... |
855 856 857 858 |
struct compat_readdir_callback buf = { .ctx.actor = compat_fillonedir, .dirent = dirent }; |
1da177e4c Linux-2.6.12-rc2 |
859 |
|
2903ff019 switch simple cas... |
860 |
if (!f.file) |
863ced7fe switch readdir/ge... |
861 |
return -EBADF; |
1da177e4c Linux-2.6.12-rc2 |
862 |
|
5c0ba4e07 [readdir] introdu... |
863 |
error = iterate_dir(f.file, &buf.ctx); |
53c9c5c0e [PATCH] prepare v... |
864 |
if (buf.result) |
1da177e4c Linux-2.6.12-rc2 |
865 |
error = buf.result; |
2903ff019 switch simple cas... |
866 |
fdput(f); |
1da177e4c Linux-2.6.12-rc2 |
867 868 869 870 871 872 873 874 875 876 877 |
return error; } struct compat_linux_dirent { compat_ulong_t d_ino; compat_ulong_t d_off; unsigned short d_reclen; char d_name[1]; }; struct compat_getdents_callback { |
5c0ba4e07 [readdir] introdu... |
878 |
struct dir_context ctx; |
1da177e4c Linux-2.6.12-rc2 |
879 880 881 882 883 884 885 |
struct compat_linux_dirent __user *current_dir; struct compat_linux_dirent __user *previous; int count; int error; }; static int compat_filldir(void *__buf, const char *name, int namlen, |
afefdbb28 [PATCH] VFS: Make... |
886 |
loff_t offset, u64 ino, unsigned int d_type) |
1da177e4c Linux-2.6.12-rc2 |
887 888 889 |
{ struct compat_linux_dirent __user * dirent; struct compat_getdents_callback *buf = __buf; |
afefdbb28 [PATCH] VFS: Make... |
890 |
compat_ulong_t d_ino; |
85c9fe8fc vfs: fix warning:... |
891 892 |
int reclen = ALIGN(offsetof(struct compat_linux_dirent, d_name) + namlen + 2, sizeof(compat_long_t)); |
1da177e4c Linux-2.6.12-rc2 |
893 894 895 896 |
buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; |
afefdbb28 [PATCH] VFS: Make... |
897 |
d_ino = ino; |
8f3f655da [PATCH] fix regul... |
898 899 |
if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { buf->error = -EOVERFLOW; |
afefdbb28 [PATCH] VFS: Make... |
900 |
return -EOVERFLOW; |
8f3f655da [PATCH] fix regul... |
901 |
} |
1da177e4c Linux-2.6.12-rc2 |
902 903 904 905 906 907 |
dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) goto efault; } dirent = buf->current_dir; |
afefdbb28 [PATCH] VFS: Make... |
908 |
if (__put_user(d_ino, &dirent->d_ino)) |
1da177e4c Linux-2.6.12-rc2 |
909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 |
goto efault; if (__put_user(reclen, &dirent->d_reclen)) goto efault; if (copy_to_user(dirent->d_name, name, namlen)) goto efault; if (__put_user(0, dirent->d_name + namlen)) goto efault; if (__put_user(d_type, (char __user *) dirent + reclen - 1)) goto efault; buf->previous = dirent; dirent = (void __user *)dirent + reclen; buf->current_dir = dirent; buf->count -= reclen; return 0; efault: buf->error = -EFAULT; return -EFAULT; } |
625b1d7e8 fs/compat: conver... |
927 928 |
COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd, struct compat_linux_dirent __user *, dirent, unsigned int, count) |
1da177e4c Linux-2.6.12-rc2 |
929 |
{ |
2903ff019 switch simple cas... |
930 |
struct fd f; |
1da177e4c Linux-2.6.12-rc2 |
931 |
struct compat_linux_dirent __user * lastdirent; |
ac6614b76 [readdir] constif... |
932 933 934 935 936 |
struct compat_getdents_callback buf = { .ctx.actor = compat_filldir, .current_dir = dirent, .count = count }; |
1da177e4c Linux-2.6.12-rc2 |
937 |
int error; |
1da177e4c Linux-2.6.12-rc2 |
938 |
if (!access_ok(VERIFY_WRITE, dirent, count)) |
863ced7fe switch readdir/ge... |
939 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
940 |
|
2903ff019 switch simple cas... |
941 942 |
f = fdget(fd); if (!f.file) |
863ced7fe switch readdir/ge... |
943 |
return -EBADF; |
1da177e4c Linux-2.6.12-rc2 |
944 |
|
5c0ba4e07 [readdir] introdu... |
945 |
error = iterate_dir(f.file, &buf.ctx); |
53c9c5c0e [PATCH] prepare v... |
946 947 |
if (error >= 0) error = buf.error; |
1da177e4c Linux-2.6.12-rc2 |
948 949 |
lastdirent = buf.previous; if (lastdirent) { |
bb6f619b3 [readdir] introdu... |
950 |
if (put_user(buf.ctx.pos, &lastdirent->d_off)) |
1da177e4c Linux-2.6.12-rc2 |
951 952 953 954 |
error = -EFAULT; else error = count - buf.count; } |
2903ff019 switch simple cas... |
955 |
fdput(f); |
1da177e4c Linux-2.6.12-rc2 |
956 957 |
return error; } |
0473c9b5f compat: let archi... |
958 |
#ifdef __ARCH_WANT_COMPAT_SYS_GETDENTS64 |
1da177e4c Linux-2.6.12-rc2 |
959 960 |
struct compat_getdents_callback64 { |
5c0ba4e07 [readdir] introdu... |
961 |
struct dir_context ctx; |
1da177e4c Linux-2.6.12-rc2 |
962 963 964 965 966 967 968 |
struct linux_dirent64 __user *current_dir; struct linux_dirent64 __user *previous; int count; int error; }; static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t offset, |
afefdbb28 [PATCH] VFS: Make... |
969 |
u64 ino, unsigned int d_type) |
1da177e4c Linux-2.6.12-rc2 |
970 971 972 |
{ struct linux_dirent64 __user *dirent; struct compat_getdents_callback64 *buf = __buf; |
85c9fe8fc vfs: fix warning:... |
973 974 |
int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1, sizeof(u64)); |
1da177e4c Linux-2.6.12-rc2 |
975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 |
u64 off; buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; dirent = buf->previous; if (dirent) { if (__put_user_unaligned(offset, &dirent->d_off)) goto efault; } dirent = buf->current_dir; if (__put_user_unaligned(ino, &dirent->d_ino)) goto efault; off = 0; if (__put_user_unaligned(off, &dirent->d_off)) goto efault; if (__put_user(reclen, &dirent->d_reclen)) goto efault; if (__put_user(d_type, &dirent->d_type)) goto efault; if (copy_to_user(dirent->d_name, name, namlen)) goto efault; if (__put_user(0, dirent->d_name + namlen)) goto efault; buf->previous = dirent; dirent = (void __user *)dirent + reclen; buf->current_dir = dirent; buf->count -= reclen; return 0; efault: buf->error = -EFAULT; return -EFAULT; } |
625b1d7e8 fs/compat: conver... |
1009 1010 |
COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd, struct linux_dirent64 __user *, dirent, unsigned int, count) |
1da177e4c Linux-2.6.12-rc2 |
1011 |
{ |
2903ff019 switch simple cas... |
1012 |
struct fd f; |
1da177e4c Linux-2.6.12-rc2 |
1013 |
struct linux_dirent64 __user * lastdirent; |
ac6614b76 [readdir] constif... |
1014 1015 1016 1017 1018 |
struct compat_getdents_callback64 buf = { .ctx.actor = compat_filldir64, .current_dir = dirent, .count = count }; |
1da177e4c Linux-2.6.12-rc2 |
1019 |
int error; |
1da177e4c Linux-2.6.12-rc2 |
1020 |
if (!access_ok(VERIFY_WRITE, dirent, count)) |
863ced7fe switch readdir/ge... |
1021 |
return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1022 |
|
2903ff019 switch simple cas... |
1023 1024 |
f = fdget(fd); if (!f.file) |
863ced7fe switch readdir/ge... |
1025 |
return -EBADF; |
1da177e4c Linux-2.6.12-rc2 |
1026 |
|
5c0ba4e07 [readdir] introdu... |
1027 |
error = iterate_dir(f.file, &buf.ctx); |
53c9c5c0e [PATCH] prepare v... |
1028 1029 |
if (error >= 0) error = buf.error; |
1da177e4c Linux-2.6.12-rc2 |
1030 1031 |
lastdirent = buf.previous; if (lastdirent) { |
bb6f619b3 [readdir] introdu... |
1032 |
typeof(lastdirent->d_off) d_off = buf.ctx.pos; |
7116e994b [PATCH] compat: f... |
1033 |
if (__put_user_unaligned(d_off, &lastdirent->d_off)) |
53c9c5c0e [PATCH] prepare v... |
1034 1035 1036 |
error = -EFAULT; else error = count - buf.count; |
1da177e4c Linux-2.6.12-rc2 |
1037 |
} |
2903ff019 switch simple cas... |
1038 |
fdput(f); |
1da177e4c Linux-2.6.12-rc2 |
1039 1040 |
return error; } |
0473c9b5f compat: let archi... |
1041 |
#endif /* __ARCH_WANT_COMPAT_SYS_GETDENTS64 */ |
1da177e4c Linux-2.6.12-rc2 |
1042 |
|
1da177e4c Linux-2.6.12-rc2 |
1043 |
/* |
e922efc34 [PATCH] remove du... |
1044 1045 1046 |
* Exactly like fs/open.c:sys_open(), except that it doesn't set the * O_LARGEFILE flag. */ |
f482e1b4a switch compat_sys... |
1047 |
COMPAT_SYSCALL_DEFINE3(open, const char __user *, filename, int, flags, umode_t, mode) |
e922efc34 [PATCH] remove du... |
1048 |
{ |
5590ff0d5 [PATCH] vfs: *at ... |
1049 1050 1051 1052 1053 1054 1055 |
return do_sys_open(AT_FDCWD, filename, flags, mode); } /* * Exactly like fs/open.c:sys_openat(), except that it doesn't set the * O_LARGEFILE flag. */ |
f482e1b4a switch compat_sys... |
1056 |
COMPAT_SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags, umode_t, mode) |
5590ff0d5 [PATCH] vfs: *at ... |
1057 1058 |
{ return do_sys_open(dfd, filename, flags, mode); |
e922efc34 [PATCH] remove du... |
1059 |
} |
1da177e4c Linux-2.6.12-rc2 |
1060 |
#define __COMPAT_NFDBITS (8 * sizeof(compat_ulong_t)) |
b773ad40a select: add poll_... |
1061 1062 1063 1064 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 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 |
static int poll_select_copy_remaining(struct timespec *end_time, void __user *p, int timeval, int ret) { struct timespec ts; if (!p) return ret; if (current->personality & STICKY_TIMEOUTS) goto sticky; /* No update for zero timeout */ if (!end_time->tv_sec && !end_time->tv_nsec) return ret; ktime_get_ts(&ts); ts = timespec_sub(*end_time, ts); if (ts.tv_sec < 0) ts.tv_sec = ts.tv_nsec = 0; if (timeval) { struct compat_timeval rtv; rtv.tv_sec = ts.tv_sec; rtv.tv_usec = ts.tv_nsec / NSEC_PER_USEC; if (!copy_to_user(p, &rtv, sizeof(rtv))) return ret; } else { struct compat_timespec rts; rts.tv_sec = ts.tv_sec; rts.tv_nsec = ts.tv_nsec; if (!copy_to_user(p, &rts, sizeof(rts))) return ret; } /* * If an application puts its timeval in read-only memory, we * don't want the Linux-specific update to the timeval to * cause a fault after the select has completed * successfully. However, because we're not updating the * timeval, we can't restart the system call. */ sticky: if (ret == -ERESTARTNOHAND) ret = -EINTR; return ret; } |
1da177e4c Linux-2.6.12-rc2 |
1111 1112 1113 1114 |
/* * Ooo, nasty. We need here to frob 32-bit unsigned longs to * 64-bit unsigned longs. */ |
858119e15 [PATCH] Unlinline... |
1115 |
static |
1da177e4c Linux-2.6.12-rc2 |
1116 1117 1118 |
int compat_get_fd_set(unsigned long nr, compat_ulong_t __user *ufdset, unsigned long *fdset) { |
022a16924 ROUND_UP macro cl... |
1119 |
nr = DIV_ROUND_UP(nr, __COMPAT_NFDBITS); |
1da177e4c Linux-2.6.12-rc2 |
1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 |
if (ufdset) { unsigned long odd; if (!access_ok(VERIFY_WRITE, ufdset, nr*sizeof(compat_ulong_t))) return -EFAULT; odd = nr & 1UL; nr &= ~1UL; while (nr) { unsigned long h, l; |
7116e994b [PATCH] compat: f... |
1130 1131 |
if (__get_user(l, ufdset) || __get_user(h, ufdset+1)) return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1132 1133 1134 1135 |
ufdset += 2; *fdset++ = h << 32 | l; nr -= 2; } |
7116e994b [PATCH] compat: f... |
1136 1137 |
if (odd && __get_user(*fdset, ufdset)) return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1138 1139 1140 1141 1142 1143 1144 1145 1146 |
} else { /* Tricky, must clear full unsigned long in the * kernel fdset at the end, this makes sure that * actually happens. */ memset(fdset, 0, ((nr + 1) & ~1)*sizeof(compat_ulong_t)); } return 0; } |
858119e15 [PATCH] Unlinline... |
1147 |
static |
7116e994b [PATCH] compat: f... |
1148 1149 |
int compat_set_fd_set(unsigned long nr, compat_ulong_t __user *ufdset, unsigned long *fdset) |
1da177e4c Linux-2.6.12-rc2 |
1150 1151 |
{ unsigned long odd; |
022a16924 ROUND_UP macro cl... |
1152 |
nr = DIV_ROUND_UP(nr, __COMPAT_NFDBITS); |
1da177e4c Linux-2.6.12-rc2 |
1153 1154 |
if (!ufdset) |
7116e994b [PATCH] compat: f... |
1155 |
return 0; |
1da177e4c Linux-2.6.12-rc2 |
1156 1157 1158 1159 1160 1161 1162 |
odd = nr & 1UL; nr &= ~1UL; while (nr) { unsigned long h, l; l = *fdset++; h = l >> 32; |
7116e994b [PATCH] compat: f... |
1163 1164 |
if (__put_user(l, ufdset) || __put_user(h, ufdset+1)) return -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1165 1166 1167 |
ufdset += 2; nr -= 2; } |
7116e994b [PATCH] compat: f... |
1168 1169 1170 |
if (odd && __put_user(*fdset, ufdset)) return -EFAULT; return 0; |
1da177e4c Linux-2.6.12-rc2 |
1171 1172 1173 1174 1175 1176 1177 |
} /* * This is a virtual copy of sys_select from fs/select.c and probably * should be compared to it from time to time */ |
1da177e4c Linux-2.6.12-rc2 |
1178 1179 1180 1181 1182 1183 1184 1185 1186 |
/* * We can actually return ERESTARTSYS instead of EINTR, but I'd * like to be certain this leads to no problems. So I return * EINTR just for safety. * * Update: ERESTARTSYS breaks at least the xview clock binary, so * I'm trying ERESTARTNOHAND which restart only when you want to. */ |
9f72949f6 [PATCH] Add psele... |
1187 |
int compat_core_sys_select(int n, compat_ulong_t __user *inp, |
8ff3e8e85 select: switch se... |
1188 1189 |
compat_ulong_t __user *outp, compat_ulong_t __user *exp, struct timespec *end_time) |
1da177e4c Linux-2.6.12-rc2 |
1190 1191 |
{ fd_set_bits fds; |
6087b2dab optimize compat_c... |
1192 |
void *bits; |
bbea9f696 [PATCH] fdtable: ... |
1193 |
int size, max_fds, ret = -EINVAL; |
a4531edd7 Fix up lost patch... |
1194 |
struct fdtable *fdt; |
6087b2dab optimize compat_c... |
1195 |
long stack_fds[SELECT_STACK_ALLOC/sizeof(long)]; |
1da177e4c Linux-2.6.12-rc2 |
1196 |
|
1da177e4c Linux-2.6.12-rc2 |
1197 1198 |
if (n < 0) goto out_nofds; |
bbea9f696 [PATCH] fdtable: ... |
1199 |
/* max_fds can increase, so grab it once to avoid race */ |
ac5b8b6f2 Preempt-safe RCU ... |
1200 |
rcu_read_lock(); |
a4531edd7 Fix up lost patch... |
1201 |
fdt = files_fdtable(current->files); |
bbea9f696 [PATCH] fdtable: ... |
1202 |
max_fds = fdt->max_fds; |
ac5b8b6f2 Preempt-safe RCU ... |
1203 |
rcu_read_unlock(); |
bbea9f696 [PATCH] fdtable: ... |
1204 1205 |
if (n > max_fds) n = max_fds; |
1da177e4c Linux-2.6.12-rc2 |
1206 1207 1208 1209 1210 1211 |
/* * We need 6 bitmaps (in/out/ex for both incoming and outgoing), * since we used fdset we need to allocate memory in units of * long-words. */ |
1da177e4c Linux-2.6.12-rc2 |
1212 |
size = FDS_BYTES(n); |
6087b2dab optimize compat_c... |
1213 1214 1215 1216 1217 1218 1219 |
bits = stack_fds; if (size > sizeof(stack_fds) / 6) { bits = kmalloc(6 * size, GFP_KERNEL); ret = -ENOMEM; if (!bits) goto out_nofds; } |
1da177e4c Linux-2.6.12-rc2 |
1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 |
fds.in = (unsigned long *) bits; fds.out = (unsigned long *) (bits + size); fds.ex = (unsigned long *) (bits + 2*size); fds.res_in = (unsigned long *) (bits + 3*size); fds.res_out = (unsigned long *) (bits + 4*size); fds.res_ex = (unsigned long *) (bits + 5*size); if ((ret = compat_get_fd_set(n, inp, fds.in)) || (ret = compat_get_fd_set(n, outp, fds.out)) || (ret = compat_get_fd_set(n, exp, fds.ex))) goto out; zero_fd_set(n, fds.res_in); zero_fd_set(n, fds.res_out); zero_fd_set(n, fds.res_ex); |
8ff3e8e85 select: switch se... |
1234 |
ret = do_select(n, &fds, end_time); |
1da177e4c Linux-2.6.12-rc2 |
1235 1236 1237 1238 1239 1240 1241 1242 1243 |
if (ret < 0) goto out; if (!ret) { ret = -ERESTARTNOHAND; if (signal_pending(current)) goto out; ret = 0; } |
7116e994b [PATCH] compat: f... |
1244 1245 1246 1247 |
if (compat_set_fd_set(n, inp, fds.res_in) || compat_set_fd_set(n, outp, fds.res_out) || compat_set_fd_set(n, exp, fds.res_ex)) ret = -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
1248 |
out: |
6087b2dab optimize compat_c... |
1249 1250 |
if (bits != stack_fds) kfree(bits); |
1da177e4c Linux-2.6.12-rc2 |
1251 1252 1253 |
out_nofds: return ret; } |
625b1d7e8 fs/compat: conver... |
1254 1255 1256 |
COMPAT_SYSCALL_DEFINE5(select, int, n, compat_ulong_t __user *, inp, compat_ulong_t __user *, outp, compat_ulong_t __user *, exp, struct compat_timeval __user *, tvp) |
9f72949f6 [PATCH] Add psele... |
1257 |
{ |
8ff3e8e85 select: switch se... |
1258 |
struct timespec end_time, *to = NULL; |
9f72949f6 [PATCH] Add psele... |
1259 1260 1261 1262 1263 1264 |
struct compat_timeval tv; int ret; if (tvp) { if (copy_from_user(&tv, tvp, sizeof(tv))) return -EFAULT; |
8ff3e8e85 select: switch se... |
1265 |
to = &end_time; |
4d36a9e65 select: deal with... |
1266 1267 1268 |
if (poll_select_set_timeout(to, tv.tv_sec + (tv.tv_usec / USEC_PER_SEC), (tv.tv_usec % USEC_PER_SEC) * NSEC_PER_USEC)) |
9f72949f6 [PATCH] Add psele... |
1269 |
return -EINVAL; |
9f72949f6 [PATCH] Add psele... |
1270 |
} |
8ff3e8e85 select: switch se... |
1271 1272 |
ret = compat_core_sys_select(n, inp, outp, exp, to); ret = poll_select_copy_remaining(&end_time, tvp, 1, ret); |
9f72949f6 [PATCH] Add psele... |
1273 1274 1275 |
return ret; } |
5d0e52830 Add generic sys_o... |
1276 1277 1278 1279 1280 1281 1282 |
struct compat_sel_arg_struct { compat_ulong_t n; compat_uptr_t inp; compat_uptr_t outp; compat_uptr_t exp; compat_uptr_t tvp; }; |
625b1d7e8 fs/compat: conver... |
1283 |
COMPAT_SYSCALL_DEFINE1(old_select, struct compat_sel_arg_struct __user *, arg) |
5d0e52830 Add generic sys_o... |
1284 1285 1286 1287 1288 1289 1290 1291 |
{ struct compat_sel_arg_struct a; if (copy_from_user(&a, arg, sizeof(a))) return -EFAULT; return compat_sys_select(a.n, compat_ptr(a.inp), compat_ptr(a.outp), compat_ptr(a.exp), compat_ptr(a.tvp)); } |
c9da9f212 [CVE-2009-0029] M... |
1292 |
static long do_compat_pselect(int n, compat_ulong_t __user *inp, |
9f72949f6 [PATCH] Add psele... |
1293 1294 1295 1296 1297 1298 |
compat_ulong_t __user *outp, compat_ulong_t __user *exp, struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, compat_size_t sigsetsize) { compat_sigset_t ss32; sigset_t ksigmask, sigsaved; |
9f72949f6 [PATCH] Add psele... |
1299 |
struct compat_timespec ts; |
8ff3e8e85 select: switch se... |
1300 |
struct timespec end_time, *to = NULL; |
9f72949f6 [PATCH] Add psele... |
1301 1302 1303 1304 1305 |
int ret; if (tsp) { if (copy_from_user(&ts, tsp, sizeof(ts))) return -EFAULT; |
8ff3e8e85 select: switch se... |
1306 1307 |
to = &end_time; if (poll_select_set_timeout(to, ts.tv_sec, ts.tv_nsec)) |
9f72949f6 [PATCH] Add psele... |
1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 |
return -EINVAL; } if (sigmask) { if (sigsetsize != sizeof(compat_sigset_t)) return -EINVAL; if (copy_from_user(&ss32, sigmask, sizeof(ss32))) return -EFAULT; sigset_from_compat(&ksigmask, &ss32); sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP)); sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved); } |
8ff3e8e85 select: switch se... |
1321 1322 |
ret = compat_core_sys_select(n, inp, outp, exp, to); ret = poll_select_copy_remaining(&end_time, tsp, 0, ret); |
9f72949f6 [PATCH] Add psele... |
1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 |
if (ret == -ERESTARTNOHAND) { /* * Don't restore the signal mask yet. Let do_signal() deliver * the signal on the way back to userspace, before the signal * mask is restored. */ if (sigmask) { memcpy(¤t->saved_sigmask, &sigsaved, sizeof(sigsaved)); |
4e4c22c71 signals: add set_... |
1333 |
set_restore_sigmask(); |
9f72949f6 [PATCH] Add psele... |
1334 1335 1336 1337 1338 1339 |
} } else if (sigmask) sigprocmask(SIG_SETMASK, &sigsaved, NULL); return ret; } |
625b1d7e8 fs/compat: conver... |
1340 1341 1342 |
COMPAT_SYSCALL_DEFINE6(pselect6, int, n, compat_ulong_t __user *, inp, compat_ulong_t __user *, outp, compat_ulong_t __user *, exp, struct compat_timespec __user *, tsp, void __user *, sig) |
9f72949f6 [PATCH] Add psele... |
1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 |
{ compat_size_t sigsetsize = 0; compat_uptr_t up = 0; if (sig) { if (!access_ok(VERIFY_READ, sig, sizeof(compat_uptr_t)+sizeof(compat_size_t)) || __get_user(up, (compat_uptr_t __user *)sig) || __get_user(sigsetsize, (compat_size_t __user *)(sig+sizeof(up)))) return -EFAULT; } |
c9da9f212 [CVE-2009-0029] M... |
1355 1356 |
return do_compat_pselect(n, inp, outp, exp, tsp, compat_ptr(up), sigsetsize); |
9f72949f6 [PATCH] Add psele... |
1357 |
} |
625b1d7e8 fs/compat: conver... |
1358 1359 1360 |
COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds, struct compat_timespec __user *, tsp, const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize) |
9f72949f6 [PATCH] Add psele... |
1361 1362 1363 1364 |
{ compat_sigset_t ss32; sigset_t ksigmask, sigsaved; struct compat_timespec ts; |
8ff3e8e85 select: switch se... |
1365 |
struct timespec end_time, *to = NULL; |
9f72949f6 [PATCH] Add psele... |
1366 1367 1368 1369 1370 |
int ret; if (tsp) { if (copy_from_user(&ts, tsp, sizeof(ts))) return -EFAULT; |
8ff3e8e85 select: switch se... |
1371 1372 1373 |
to = &end_time; if (poll_select_set_timeout(to, ts.tv_sec, ts.tv_nsec)) return -EINVAL; |
9f72949f6 [PATCH] Add psele... |
1374 1375 1376 |
} if (sigmask) { |
3835a9bd0 [PATCH] fs/compat... |
1377 |
if (sigsetsize != sizeof(compat_sigset_t)) |
9f72949f6 [PATCH] Add psele... |
1378 1379 1380 1381 1382 1383 1384 1385 |
return -EINVAL; if (copy_from_user(&ss32, sigmask, sizeof(ss32))) return -EFAULT; sigset_from_compat(&ksigmask, &ss32); sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP)); sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved); } |
8ff3e8e85 select: switch se... |
1386 |
ret = do_sys_poll(ufds, nfds, to); |
9f72949f6 [PATCH] Add psele... |
1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 |
/* We can restart this syscall, usually */ if (ret == -EINTR) { /* * Don't restore the signal mask yet. Let do_signal() deliver * the signal on the way back to userspace, before the signal * mask is restored. */ if (sigmask) { memcpy(¤t->saved_sigmask, &sigsaved, sizeof(sigsaved)); |
4e4c22c71 signals: add set_... |
1398 |
set_restore_sigmask(); |
9f72949f6 [PATCH] Add psele... |
1399 1400 1401 1402 |
} ret = -ERESTARTNOHAND; } else if (sigmask) sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
8ff3e8e85 select: switch se... |
1403 |
ret = poll_select_copy_remaining(&end_time, tsp, 0, ret); |
9f72949f6 [PATCH] Add psele... |
1404 1405 1406 |
return ret; } |
9f72949f6 [PATCH] Add psele... |
1407 |
|
becfd1f37 vfs: Add open by ... |
1408 1409 1410 1411 1412 |
#ifdef CONFIG_FHANDLE /* * Exactly like fs/open.c:sys_open_by_handle_at(), except that it * doesn't set the O_LARGEFILE flag. */ |
f482e1b4a switch compat_sys... |
1413 1414 |
COMPAT_SYSCALL_DEFINE3(open_by_handle_at, int, mountdirfd, struct file_handle __user *, handle, int, flags) |
becfd1f37 vfs: Add open by ... |
1415 1416 1417 1418 |
{ return do_handle_open(mountdirfd, handle, flags); } #endif |