Blame view
net/compat.c
24.8 KB
4768fbcbc [NET]: Fix whites... |
1 |
/* |
1da177e4c Linux-2.6.12-rc2 |
2 3 4 5 6 7 8 9 10 |
* 32bit Socket syscall emulation. Based on arch/sparc64/kernel/sys_sparc32.c. * * Copyright (C) 2000 VA Linux Co * Copyright (C) 2000 Don Dugger <n0ano@valinux.com> * Copyright (C) 1999 Arun Sharma <arun.sharma@intel.com> * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 2000 Hewlett-Packard Co. * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com> |
4768fbcbc [NET]: Fix whites... |
11 |
* Copyright (C) 2000,2001 Andi Kleen, SuSE Labs |
1da177e4c Linux-2.6.12-rc2 |
12 13 14 |
*/ #include <linux/kernel.h> |
5a0e3ad6a include cleanup: ... |
15 |
#include <linux/gfp.h> |
1da177e4c Linux-2.6.12-rc2 |
16 |
#include <linux/fs.h> |
1da177e4c Linux-2.6.12-rc2 |
17 18 19 20 21 22 23 |
#include <linux/types.h> #include <linux/file.h> #include <linux/icmpv6.h> #include <linux/socket.h> #include <linux/syscalls.h> #include <linux/filter.h> #include <linux/compat.h> |
1da177e4c Linux-2.6.12-rc2 |
24 |
#include <linux/security.h> |
bc3b2d7fb net: Add export.h... |
25 |
#include <linux/export.h> |
1da177e4c Linux-2.6.12-rc2 |
26 27 28 |
#include <net/scm.h> #include <net/sock.h> |
dae502954 ipv4/ipv6 compat:... |
29 30 |
#include <net/ip.h> #include <net/ipv6.h> |
1da177e4c Linux-2.6.12-rc2 |
31 32 33 34 35 36 37 38 |
#include <asm/uaccess.h> #include <net/compat.h> static inline int iov_from_user_compat_to_kern(struct iovec *kiov, struct compat_iovec __user *uiov32, int niov) { int tot_len = 0; |
e71a4783a [NET] core: white... |
39 |
while (niov > 0) { |
1da177e4c Linux-2.6.12-rc2 |
40 41 |
compat_uptr_t buf; compat_size_t len; |
e71a4783a [NET] core: white... |
42 |
if (get_user(len, &uiov32->iov_len) || |
8acfe468b net: Limit socket... |
43 44 45 46 47 |
get_user(buf, &uiov32->iov_base)) return -EFAULT; if (len > INT_MAX - tot_len) len = INT_MAX - tot_len; |
1da177e4c Linux-2.6.12-rc2 |
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 |
tot_len += len; kiov->iov_base = compat_ptr(buf); kiov->iov_len = (__kernel_size_t) len; uiov32++; kiov++; niov--; } return tot_len; } int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) { compat_uptr_t tmp1, tmp2, tmp3; if (!access_ok(VERIFY_READ, umsg, sizeof(*umsg)) || __get_user(tmp1, &umsg->msg_name) || __get_user(kmsg->msg_namelen, &umsg->msg_namelen) || __get_user(tmp2, &umsg->msg_iov) || __get_user(kmsg->msg_iovlen, &umsg->msg_iovlen) || __get_user(tmp3, &umsg->msg_control) || __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) return -EFAULT; kmsg->msg_name = compat_ptr(tmp1); kmsg->msg_iov = compat_ptr(tmp2); kmsg->msg_control = compat_ptr(tmp3); return 0; } /* I've named the args so it is easy to tell whose space the pointers are in. */ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, |
43db362d3 net: get rid of s... |
79 |
struct sockaddr_storage *kern_address, int mode) |
1da177e4c Linux-2.6.12-rc2 |
80 81 |
{ int tot_len; |
e71a4783a [NET] core: white... |
82 |
if (kern_msg->msg_namelen) { |
c6d409cfd From abbffa2aa9bd... |
83 |
if (mode == VERIFY_READ) { |
1da177e4c Linux-2.6.12-rc2 |
84 85 86 |
int err = move_addr_to_kernel(kern_msg->msg_name, kern_msg->msg_namelen, kern_address); |
e71a4783a [NET] core: white... |
87 |
if (err < 0) |
1da177e4c Linux-2.6.12-rc2 |
88 89 90 91 92 |
return err; } kern_msg->msg_name = kern_address; } else kern_msg->msg_name = NULL; |
1da177e4c Linux-2.6.12-rc2 |
93 94 95 |
tot_len = iov_from_user_compat_to_kern(kern_iov, (struct compat_iovec __user *)kern_msg->msg_iov, kern_msg->msg_iovlen); |
e71a4783a [NET] core: white... |
96 |
if (tot_len >= 0) |
1da177e4c Linux-2.6.12-rc2 |
97 |
kern_msg->msg_iov = kern_iov; |
1da177e4c Linux-2.6.12-rc2 |
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
return tot_len; } /* Bleech... */ #define CMSG_COMPAT_ALIGN(len) ALIGN((len), sizeof(s32)) #define CMSG_COMPAT_DATA(cmsg) \ ((void __user *)((char __user *)(cmsg) + CMSG_COMPAT_ALIGN(sizeof(struct compat_cmsghdr)))) #define CMSG_COMPAT_SPACE(len) \ (CMSG_COMPAT_ALIGN(sizeof(struct compat_cmsghdr)) + CMSG_COMPAT_ALIGN(len)) #define CMSG_COMPAT_LEN(len) \ (CMSG_COMPAT_ALIGN(sizeof(struct compat_cmsghdr)) + (len)) #define CMSG_COMPAT_FIRSTHDR(msg) \ (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \ (struct compat_cmsghdr __user *)((msg)->msg_control) : \ (struct compat_cmsghdr __user *)NULL) #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \ ((ucmlen) >= sizeof(struct compat_cmsghdr) && \ (ucmlen) <= (unsigned long) \ ((mhdr)->msg_controllen - \ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg, struct compat_cmsghdr __user *cmsg, int cmsg_len) { char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len); if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) > msg->msg_controllen) return NULL; return (struct compat_cmsghdr __user *)ptr; } /* There is a lot of hair here because the alignment rules (and * thus placement) of cmsg headers and length are different for * 32-bit apps. -DaveM */ |
8920e8f94 [PATCH] Fix 32bit... |
137 |
int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, |
1da177e4c Linux-2.6.12-rc2 |
138 139 140 141 142 143 |
unsigned char *stackbuf, int stackbuf_size) { struct compat_cmsghdr __user *ucmsg; struct cmsghdr *kcmsg, *kcmsg_base; compat_size_t ucmlen; __kernel_size_t kcmlen, tmp; |
8920e8f94 [PATCH] Fix 32bit... |
144 |
int err = -EFAULT; |
1da177e4c Linux-2.6.12-rc2 |
145 146 147 148 |
kcmlen = 0; kcmsg_base = kcmsg = (struct cmsghdr *)stackbuf; ucmsg = CMSG_COMPAT_FIRSTHDR(kmsg); |
e71a4783a [NET] core: white... |
149 150 |
while (ucmsg != NULL) { if (get_user(ucmlen, &ucmsg->cmsg_len)) |
1da177e4c Linux-2.6.12-rc2 |
151 152 153 154 155 156 157 158 |
return -EFAULT; /* Catch bogons. */ if (!CMSG_COMPAT_OK(ucmlen, ucmsg, kmsg)) return -EINVAL; tmp = ((ucmlen - CMSG_COMPAT_ALIGN(sizeof(*ucmsg))) + CMSG_ALIGN(sizeof(struct cmsghdr))); |
8920e8f94 [PATCH] Fix 32bit... |
159 |
tmp = CMSG_ALIGN(tmp); |
1da177e4c Linux-2.6.12-rc2 |
160 161 162 |
kcmlen += tmp; ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, ucmlen); } |
e71a4783a [NET] core: white... |
163 |
if (kcmlen == 0) |
1da177e4c Linux-2.6.12-rc2 |
164 165 166 167 168 169 170 |
return -EINVAL; /* The kcmlen holds the 64-bit version of the control length. * It may not be modified as we do not stick it into the kmsg * until we have successfully copied over all of the data * from the user. */ |
8920e8f94 [PATCH] Fix 32bit... |
171 172 173 |
if (kcmlen > stackbuf_size) kcmsg_base = kcmsg = sock_kmalloc(sk, kcmlen, GFP_KERNEL); if (kcmsg == NULL) |
1da177e4c Linux-2.6.12-rc2 |
174 175 176 177 178 |
return -ENOBUFS; /* Now copy them over neatly. */ memset(kcmsg, 0, kcmlen); ucmsg = CMSG_COMPAT_FIRSTHDR(kmsg); |
e71a4783a [NET] core: white... |
179 |
while (ucmsg != NULL) { |
8920e8f94 [PATCH] Fix 32bit... |
180 181 182 183 |
if (__get_user(ucmlen, &ucmsg->cmsg_len)) goto Efault; if (!CMSG_COMPAT_OK(ucmlen, ucmsg, kmsg)) goto Einval; |
1da177e4c Linux-2.6.12-rc2 |
184 185 |
tmp = ((ucmlen - CMSG_COMPAT_ALIGN(sizeof(*ucmsg))) + CMSG_ALIGN(sizeof(struct cmsghdr))); |
8920e8f94 [PATCH] Fix 32bit... |
186 187 |
if ((char *)kcmsg_base + kcmlen - (char *)kcmsg < CMSG_ALIGN(tmp)) goto Einval; |
1da177e4c Linux-2.6.12-rc2 |
188 |
kcmsg->cmsg_len = tmp; |
8920e8f94 [PATCH] Fix 32bit... |
189 190 191 192 193 194 195 |
tmp = CMSG_ALIGN(tmp); if (__get_user(kcmsg->cmsg_level, &ucmsg->cmsg_level) || __get_user(kcmsg->cmsg_type, &ucmsg->cmsg_type) || copy_from_user(CMSG_DATA(kcmsg), CMSG_COMPAT_DATA(ucmsg), (ucmlen - CMSG_COMPAT_ALIGN(sizeof(*ucmsg))))) goto Efault; |
1da177e4c Linux-2.6.12-rc2 |
196 197 |
/* Advance. */ |
8920e8f94 [PATCH] Fix 32bit... |
198 |
kcmsg = (struct cmsghdr *)((char *)kcmsg + tmp); |
1da177e4c Linux-2.6.12-rc2 |
199 200 201 202 203 204 205 |
ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, ucmlen); } /* Ok, looks like we made it. Hook it up and return success. */ kmsg->msg_control = kcmsg_base; kmsg->msg_controllen = kcmlen; return 0; |
8920e8f94 [PATCH] Fix 32bit... |
206 207 208 209 210 211 |
Einval: err = -EINVAL; Efault: if (kcmsg_base != (struct cmsghdr *)stackbuf) sock_kfree_s(sk, kcmsg_base, kcmlen); return err; |
1da177e4c Linux-2.6.12-rc2 |
212 213 214 215 |
} int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data) { |
1da177e4c Linux-2.6.12-rc2 |
216 217 |
struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control; struct compat_cmsghdr cmhdr; |
818810472 net: Fix referenc... |
218 219 |
struct compat_timeval ctv; struct compat_timespec cts[3]; |
1da177e4c Linux-2.6.12-rc2 |
220 |
int cmlen; |
e71a4783a [NET] core: white... |
221 |
if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) { |
1da177e4c Linux-2.6.12-rc2 |
222 223 224 |
kmsg->msg_flags |= MSG_CTRUNC; return 0; /* XXX: return error? check spec. */ } |
ee4fa23c4 compat: Use COMPA... |
225 |
if (!COMPAT_USE_64BIT_TIME) { |
ee4fa23c4 compat: Use COMPA... |
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 |
if (level == SOL_SOCKET && type == SCM_TIMESTAMP) { struct timeval *tv = (struct timeval *)data; ctv.tv_sec = tv->tv_sec; ctv.tv_usec = tv->tv_usec; data = &ctv; len = sizeof(ctv); } if (level == SOL_SOCKET && (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) { int count = type == SCM_TIMESTAMPNS ? 1 : 3; int i; struct timespec *ts = (struct timespec *)data; for (i = 0; i < count; i++) { cts[i].tv_sec = ts[i].tv_sec; cts[i].tv_nsec = ts[i].tv_nsec; } data = &cts; len = sizeof(cts[0]) * count; |
20d494735 net: socket infra... |
244 |
} |
4768fbcbc [NET]: Fix whites... |
245 |
} |
1da177e4c Linux-2.6.12-rc2 |
246 |
cmlen = CMSG_COMPAT_LEN(len); |
e71a4783a [NET] core: white... |
247 |
if (kmsg->msg_controllen < cmlen) { |
1da177e4c Linux-2.6.12-rc2 |
248 249 250 251 252 253 |
kmsg->msg_flags |= MSG_CTRUNC; cmlen = kmsg->msg_controllen; } cmhdr.cmsg_level = level; cmhdr.cmsg_type = type; cmhdr.cmsg_len = cmlen; |
e71a4783a [NET] core: white... |
254 |
if (copy_to_user(cm, &cmhdr, sizeof cmhdr)) |
1da177e4c Linux-2.6.12-rc2 |
255 |
return -EFAULT; |
e71a4783a [NET] core: white... |
256 |
if (copy_to_user(CMSG_COMPAT_DATA(cm), data, cmlen - sizeof(struct compat_cmsghdr))) |
1da177e4c Linux-2.6.12-rc2 |
257 258 |
return -EFAULT; cmlen = CMSG_COMPAT_SPACE(len); |
1ac70e7ad [NET]: Fix functi... |
259 260 |
if (kmsg->msg_controllen < cmlen) cmlen = kmsg->msg_controllen; |
1da177e4c Linux-2.6.12-rc2 |
261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
kmsg->msg_control += cmlen; kmsg->msg_controllen -= cmlen; return 0; } void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) { struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control; int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int); int fdnum = scm->fp->count; struct file **fp = scm->fp->fp; int __user *cmfptr; int err = 0, i; if (fdnum < fdmax) fdmax = fdnum; for (i = 0, cmfptr = (int __user *) CMSG_COMPAT_DATA(cm); i < fdmax; i++, cmfptr++) { int new_fd; err = security_file_receive(fp[i]); if (err) break; |
4a19542e5 O_CLOEXEC for SCM... |
283 284 |
err = get_unused_fd_flags(MSG_CMSG_CLOEXEC & kmsg->msg_flags ? O_CLOEXEC : 0); |
1da177e4c Linux-2.6.12-rc2 |
285 286 287 288 289 290 291 292 293 |
if (err < 0) break; new_fd = err; err = put_user(new_fd, cmfptr); if (err) { put_unused_fd(new_fd); break; } /* Bump the usage count and install the file. */ |
cb0942b81 make get_file() r... |
294 |
fd_install(new_fd, get_file(fp[i])); |
1da177e4c Linux-2.6.12-rc2 |
295 296 297 298 |
} if (i > 0) { int cmlen = CMSG_COMPAT_LEN(i * sizeof(int)); |
effee6a00 [NET]: File descr... |
299 |
err = put_user(SOL_SOCKET, &cm->cmsg_level); |
1da177e4c Linux-2.6.12-rc2 |
300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 |
if (!err) err = put_user(SCM_RIGHTS, &cm->cmsg_type); if (!err) err = put_user(cmlen, &cm->cmsg_len); if (!err) { cmlen = CMSG_COMPAT_SPACE(i * sizeof(int)); kmsg->msg_control += cmlen; kmsg->msg_controllen -= cmlen; } } if (i < fdnum) kmsg->msg_flags |= MSG_CTRUNC; /* * All of the files that fit in the message have had their * usage counts incremented, so we just free the list. */ __scm_destroy(scm); } |
3fdadf7d2 [NET]: {get|set}s... |
319 |
static int do_set_attach_filter(struct socket *sock, int level, int optname, |
b7058842c net: Make setsock... |
320 |
char __user *optval, unsigned int optlen) |
1da177e4c Linux-2.6.12-rc2 |
321 322 |
{ struct compat_sock_fprog __user *fprog32 = (struct compat_sock_fprog __user *)optval; |
4768fbcbc [NET]: Fix whites... |
323 |
struct sock_fprog __user *kfprog = compat_alloc_user_space(sizeof(struct sock_fprog)); |
1da177e4c Linux-2.6.12-rc2 |
324 325 326 327 328 329 330 331 332 333 |
compat_uptr_t ptr; u16 len; if (!access_ok(VERIFY_READ, fprog32, sizeof(*fprog32)) || !access_ok(VERIFY_WRITE, kfprog, sizeof(struct sock_fprog)) || __get_user(len, &fprog32->len) || __get_user(ptr, &fprog32->filter) || __put_user(len, &kfprog->len) || __put_user(compat_ptr(ptr), &kfprog->filter)) return -EFAULT; |
3fdadf7d2 [NET]: {get|set}s... |
334 |
return sock_setsockopt(sock, level, optname, (char __user *)kfprog, |
1da177e4c Linux-2.6.12-rc2 |
335 336 |
sizeof(struct sock_fprog)); } |
3fdadf7d2 [NET]: {get|set}s... |
337 |
static int do_set_sock_timeout(struct socket *sock, int level, |
b7058842c net: Make setsock... |
338 |
int optname, char __user *optval, unsigned int optlen) |
1da177e4c Linux-2.6.12-rc2 |
339 |
{ |
c6d409cfd From abbffa2aa9bd... |
340 |
struct compat_timeval __user *up = (struct compat_timeval __user *)optval; |
1da177e4c Linux-2.6.12-rc2 |
341 342 343 344 345 346 347 348 349 350 351 352 |
struct timeval ktime; mm_segment_t old_fs; int err; if (optlen < sizeof(*up)) return -EINVAL; if (!access_ok(VERIFY_READ, up, sizeof(*up)) || __get_user(ktime.tv_sec, &up->tv_sec) || __get_user(ktime.tv_usec, &up->tv_usec)) return -EFAULT; old_fs = get_fs(); set_fs(KERNEL_DS); |
c6d409cfd From abbffa2aa9bd... |
353 |
err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime)); |
1da177e4c Linux-2.6.12-rc2 |
354 355 356 357 |
set_fs(old_fs); return err; } |
3fdadf7d2 [NET]: {get|set}s... |
358 |
static int compat_sock_setsockopt(struct socket *sock, int level, int optname, |
b7058842c net: Make setsock... |
359 |
char __user *optval, unsigned int optlen) |
3fdadf7d2 [NET]: {get|set}s... |
360 361 362 363 364 365 366 367 368 |
{ if (optname == SO_ATTACH_FILTER) return do_set_attach_filter(sock, level, optname, optval, optlen); if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO) return do_set_sock_timeout(sock, level, optname, optval, optlen); return sock_setsockopt(sock, level, optname, optval, optlen); } |
1da177e4c Linux-2.6.12-rc2 |
369 |
asmlinkage long compat_sys_setsockopt(int fd, int level, int optname, |
b7058842c net: Make setsock... |
370 |
char __user *optval, unsigned int optlen) |
1da177e4c Linux-2.6.12-rc2 |
371 |
{ |
3fdadf7d2 [NET]: {get|set}s... |
372 |
int err; |
c6d409cfd From abbffa2aa9bd... |
373 |
struct socket *sock = sockfd_lookup(fd, &err); |
3fdadf7d2 [NET]: {get|set}s... |
374 |
|
c6d409cfd From abbffa2aa9bd... |
375 376 |
if (sock) { err = security_socket_setsockopt(sock, level, optname); |
3fdadf7d2 [NET]: {get|set}s... |
377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 |
if (err) { sockfd_put(sock); return err; } if (level == SOL_SOCKET) err = compat_sock_setsockopt(sock, level, optname, optval, optlen); else if (sock->ops->compat_setsockopt) err = sock->ops->compat_setsockopt(sock, level, optname, optval, optlen); else err = sock->ops->setsockopt(sock, level, optname, optval, optlen); sockfd_put(sock); } return err; |
1da177e4c Linux-2.6.12-rc2 |
394 |
} |
3fdadf7d2 [NET]: {get|set}s... |
395 |
static int do_get_sock_timeout(struct socket *sock, int level, int optname, |
1da177e4c Linux-2.6.12-rc2 |
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 |
char __user *optval, int __user *optlen) { struct compat_timeval __user *up; struct timeval ktime; mm_segment_t old_fs; int len, err; up = (struct compat_timeval __user *) optval; if (get_user(len, optlen)) return -EFAULT; if (len < sizeof(*up)) return -EINVAL; len = sizeof(ktime); old_fs = get_fs(); set_fs(KERNEL_DS); |
3fdadf7d2 [NET]: {get|set}s... |
411 |
err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len); |
1da177e4c Linux-2.6.12-rc2 |
412 413 414 415 416 417 418 419 420 421 422 |
set_fs(old_fs); if (!err) { if (put_user(sizeof(*up), optlen) || !access_ok(VERIFY_WRITE, up, sizeof(*up)) || __put_user(ktime.tv_sec, &up->tv_sec) || __put_user(ktime.tv_usec, &up->tv_usec)) err = -EFAULT; } return err; } |
3fdadf7d2 [NET]: {get|set}s... |
423 |
static int compat_sock_getsockopt(struct socket *sock, int level, int optname, |
1da177e4c Linux-2.6.12-rc2 |
424 425 |
char __user *optval, int __user *optlen) { |
3fdadf7d2 [NET]: {get|set}s... |
426 427 428 |
if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO) return do_get_sock_timeout(sock, level, optname, optval, optlen); return sock_getsockopt(sock, level, optname, optval, optlen); |
1da177e4c Linux-2.6.12-rc2 |
429 |
} |
f0ac26144 [NET]: socket tim... |
430 431 |
int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) { |
ee4fa23c4 compat: Use COMPA... |
432 433 |
struct compat_timeval __user *ctv; int err; |
b7aa0bf70 [NET]: convert ne... |
434 |
struct timeval tv; |
f0ac26144 [NET]: socket tim... |
435 |
|
ee4fa23c4 compat: Use COMPA... |
436 437 438 439 440 |
if (COMPAT_USE_64BIT_TIME) return sock_get_timestamp(sk, userstamp); ctv = (struct compat_timeval __user *) userstamp; err = -ENOENT; |
f0ac26144 [NET]: socket tim... |
441 |
if (!sock_flag(sk, SOCK_TIMESTAMP)) |
20d494735 net: socket infra... |
442 |
sock_enable_timestamp(sk, SOCK_TIMESTAMP); |
b7aa0bf70 [NET]: convert ne... |
443 444 |
tv = ktime_to_timeval(sk->sk_stamp); if (tv.tv_sec == -1) |
f0ac26144 [NET]: socket tim... |
445 |
return err; |
b7aa0bf70 [NET]: convert ne... |
446 447 448 449 450 451 452 |
if (tv.tv_sec == 0) { sk->sk_stamp = ktime_get_real(); tv = ktime_to_timeval(sk->sk_stamp); } err = 0; if (put_user(tv.tv_sec, &ctv->tv_sec) || put_user(tv.tv_usec, &ctv->tv_usec)) |
f0ac26144 [NET]: socket tim... |
453 454 455 456 |
err = -EFAULT; return err; } EXPORT_SYMBOL(compat_sock_get_timestamp); |
ae40eb1ef [NET]: Introduce ... |
457 458 |
int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) { |
ee4fa23c4 compat: Use COMPA... |
459 460 |
struct compat_timespec __user *ctv; int err; |
ae40eb1ef [NET]: Introduce ... |
461 |
struct timespec ts; |
ee4fa23c4 compat: Use COMPA... |
462 463 464 465 466 |
if (COMPAT_USE_64BIT_TIME) return sock_get_timestampns (sk, userstamp); ctv = (struct compat_timespec __user *) userstamp; err = -ENOENT; |
ae40eb1ef [NET]: Introduce ... |
467 |
if (!sock_flag(sk, SOCK_TIMESTAMP)) |
20d494735 net: socket infra... |
468 |
sock_enable_timestamp(sk, SOCK_TIMESTAMP); |
ae40eb1ef [NET]: Introduce ... |
469 470 471 472 473 474 475 476 477 478 479 480 481 482 |
ts = ktime_to_timespec(sk->sk_stamp); if (ts.tv_sec == -1) return err; if (ts.tv_sec == 0) { sk->sk_stamp = ktime_get_real(); ts = ktime_to_timespec(sk->sk_stamp); } err = 0; if (put_user(ts.tv_sec, &ctv->tv_sec) || put_user(ts.tv_nsec, &ctv->tv_nsec)) err = -EFAULT; return err; } EXPORT_SYMBOL(compat_sock_get_timestampns); |
3fdadf7d2 [NET]: {get|set}s... |
483 484 485 486 |
asmlinkage long compat_sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen) { int err; |
c6d409cfd From abbffa2aa9bd... |
487 |
struct socket *sock = sockfd_lookup(fd, &err); |
3fdadf7d2 [NET]: {get|set}s... |
488 |
|
c6d409cfd From abbffa2aa9bd... |
489 490 |
if (sock) { err = security_socket_getsockopt(sock, level, optname); |
3fdadf7d2 [NET]: {get|set}s... |
491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 |
if (err) { sockfd_put(sock); return err; } if (level == SOL_SOCKET) err = compat_sock_getsockopt(sock, level, optname, optval, optlen); else if (sock->ops->compat_getsockopt) err = sock->ops->compat_getsockopt(sock, level, optname, optval, optlen); else err = sock->ops->getsockopt(sock, level, optname, optval, optlen); sockfd_put(sock); } return err; } |
dae502954 ipv4/ipv6 compat:... |
509 510 511 512 513 |
struct compat_group_req { __u32 gr_interface; struct __kernel_sockaddr_storage gr_group __attribute__ ((aligned(4))); |
bc10502db net: use __packed... |
514 |
} __packed; |
dae502954 ipv4/ipv6 compat:... |
515 516 517 518 519 520 521 |
struct compat_group_source_req { __u32 gsr_interface; struct __kernel_sockaddr_storage gsr_group __attribute__ ((aligned(4))); struct __kernel_sockaddr_storage gsr_source __attribute__ ((aligned(4))); |
bc10502db net: use __packed... |
522 |
} __packed; |
dae502954 ipv4/ipv6 compat:... |
523 524 525 526 527 528 529 530 531 |
struct compat_group_filter { __u32 gf_interface; struct __kernel_sockaddr_storage gf_group __attribute__ ((aligned(4))); __u32 gf_fmode; __u32 gf_numsrc; struct __kernel_sockaddr_storage gf_slist[1] __attribute__ ((aligned(4))); |
bc10502db net: use __packed... |
532 |
} __packed; |
dae502954 ipv4/ipv6 compat:... |
533 |
|
be666e0a1 net: Several clea... |
534 535 |
#define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \ sizeof(struct __kernel_sockaddr_storage)) |
dae502954 ipv4/ipv6 compat:... |
536 537 |
int compat_mc_setsockopt(struct sock *sock, int level, int optname, |
b7058842c net: Make setsock... |
538 |
char __user *optval, unsigned int optlen, |
c6d409cfd From abbffa2aa9bd... |
539 |
int (*setsockopt)(struct sock *, int, int, char __user *, unsigned int)) |
dae502954 ipv4/ipv6 compat:... |
540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 |
{ char __user *koptval = optval; int koptlen = optlen; switch (optname) { case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: { struct compat_group_req __user *gr32 = (void *)optval; struct group_req __user *kgr = compat_alloc_user_space(sizeof(struct group_req)); u32 interface; if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) || !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) || __get_user(interface, &gr32->gr_interface) || __put_user(interface, &kgr->gr_interface) || copy_in_user(&kgr->gr_group, &gr32->gr_group, sizeof(kgr->gr_group))) return -EFAULT; koptval = (char __user *)kgr; koptlen = sizeof(struct group_req); break; } case MCAST_JOIN_SOURCE_GROUP: case MCAST_LEAVE_SOURCE_GROUP: case MCAST_BLOCK_SOURCE: case MCAST_UNBLOCK_SOURCE: { struct compat_group_source_req __user *gsr32 = (void *)optval; |
be666e0a1 net: Several clea... |
570 |
struct group_source_req __user *kgsr = compat_alloc_user_space( |
dae502954 ipv4/ipv6 compat:... |
571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 |
sizeof(struct group_source_req)); u32 interface; if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) || !access_ok(VERIFY_WRITE, kgsr, sizeof(struct group_source_req)) || __get_user(interface, &gsr32->gsr_interface) || __put_user(interface, &kgsr->gsr_interface) || copy_in_user(&kgsr->gsr_group, &gsr32->gsr_group, sizeof(kgsr->gsr_group)) || copy_in_user(&kgsr->gsr_source, &gsr32->gsr_source, sizeof(kgsr->gsr_source))) return -EFAULT; koptval = (char __user *)kgsr; koptlen = sizeof(struct group_source_req); break; } case MCAST_MSFILTER: { struct compat_group_filter __user *gf32 = (void *)optval; |
be666e0a1 net: Several clea... |
591 |
struct group_filter __user *kgf; |
dae502954 ipv4/ipv6 compat:... |
592 |
u32 interface, fmode, numsrc; |
be666e0a1 net: Several clea... |
593 |
if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) || |
dae502954 ipv4/ipv6 compat:... |
594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 |
__get_user(interface, &gf32->gf_interface) || __get_user(fmode, &gf32->gf_fmode) || __get_user(numsrc, &gf32->gf_numsrc)) return -EFAULT; koptlen = optlen + sizeof(struct group_filter) - sizeof(struct compat_group_filter); if (koptlen < GROUP_FILTER_SIZE(numsrc)) return -EINVAL; kgf = compat_alloc_user_space(koptlen); if (!access_ok(VERIFY_WRITE, kgf, koptlen) || __put_user(interface, &kgf->gf_interface) || __put_user(fmode, &kgf->gf_fmode) || __put_user(numsrc, &kgf->gf_numsrc) || copy_in_user(&kgf->gf_group, &gf32->gf_group, sizeof(kgf->gf_group)) || |
be666e0a1 net: Several clea... |
609 |
(numsrc && copy_in_user(kgf->gf_slist, gf32->gf_slist, |
dae502954 ipv4/ipv6 compat:... |
610 611 612 613 614 615 616 617 618 619 620 |
numsrc * sizeof(kgf->gf_slist[0])))) return -EFAULT; koptval = (char __user *)kgf; break; } default: break; } return setsockopt(sock, level, optname, koptval, koptlen); } |
dae502954 ipv4/ipv6 compat:... |
621 |
EXPORT_SYMBOL(compat_mc_setsockopt); |
42908c69f net: Add compat s... |
622 623 |
int compat_mc_getsockopt(struct sock *sock, int level, int optname, char __user *optval, int __user *optlen, |
c6d409cfd From abbffa2aa9bd... |
624 |
int (*getsockopt)(struct sock *, int, int, char __user *, int __user *)) |
42908c69f net: Add compat s... |
625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 |
{ struct compat_group_filter __user *gf32 = (void *)optval; struct group_filter __user *kgf; int __user *koptlen; u32 interface, fmode, numsrc; int klen, ulen, err; if (optname != MCAST_MSFILTER) return getsockopt(sock, level, optname, optval, optlen); koptlen = compat_alloc_user_space(sizeof(*koptlen)); if (!access_ok(VERIFY_READ, optlen, sizeof(*optlen)) || __get_user(ulen, optlen)) return -EFAULT; /* adjust len for pad */ klen = ulen + sizeof(*kgf) - sizeof(*gf32); if (klen < GROUP_FILTER_SIZE(0)) return -EINVAL; if (!access_ok(VERIFY_WRITE, koptlen, sizeof(*koptlen)) || __put_user(klen, koptlen)) return -EFAULT; /* have to allow space for previous compat_alloc_user_space, too */ kgf = compat_alloc_user_space(klen+sizeof(*optlen)); if (!access_ok(VERIFY_READ, gf32, __COMPAT_GF0_SIZE) || __get_user(interface, &gf32->gf_interface) || __get_user(fmode, &gf32->gf_fmode) || __get_user(numsrc, &gf32->gf_numsrc) || __put_user(interface, &kgf->gf_interface) || __put_user(fmode, &kgf->gf_fmode) || __put_user(numsrc, &kgf->gf_numsrc) || |
c6d409cfd From abbffa2aa9bd... |
660 |
copy_in_user(&kgf->gf_group, &gf32->gf_group, sizeof(kgf->gf_group))) |
42908c69f net: Add compat s... |
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 691 692 |
return -EFAULT; err = getsockopt(sock, level, optname, (char __user *)kgf, koptlen); if (err) return err; if (!access_ok(VERIFY_READ, koptlen, sizeof(*koptlen)) || __get_user(klen, koptlen)) return -EFAULT; ulen = klen - (sizeof(*kgf)-sizeof(*gf32)); if (!access_ok(VERIFY_WRITE, optlen, sizeof(*optlen)) || __put_user(ulen, optlen)) return -EFAULT; if (!access_ok(VERIFY_READ, kgf, klen) || !access_ok(VERIFY_WRITE, gf32, ulen) || __get_user(interface, &kgf->gf_interface) || __get_user(fmode, &kgf->gf_fmode) || __get_user(numsrc, &kgf->gf_numsrc) || __put_user(interface, &gf32->gf_interface) || __put_user(fmode, &gf32->gf_fmode) || __put_user(numsrc, &gf32->gf_numsrc)) return -EFAULT; if (numsrc) { int copylen; klen -= GROUP_FILTER_SIZE(0); copylen = numsrc * sizeof(gf32->gf_slist[0]); if (copylen > klen) copylen = klen; |
c6d409cfd From abbffa2aa9bd... |
693 |
if (copy_in_user(gf32->gf_slist, kgf->gf_slist, copylen)) |
42908c69f net: Add compat s... |
694 695 696 697 |
return -EFAULT; } return err; } |
42908c69f net: Add compat s... |
698 |
EXPORT_SYMBOL(compat_mc_getsockopt); |
dae502954 ipv4/ipv6 compat:... |
699 |
|
1da177e4c Linux-2.6.12-rc2 |
700 701 |
/* Argument list sizes for compat_sys_socketcall */ #define AL(x) ((x) * sizeof(u32)) |
228e548e6 net: Add sendmmsg... |
702 |
static unsigned char nas[21] = { |
c6d409cfd From abbffa2aa9bd... |
703 704 705 |
AL(0), AL(3), AL(3), AL(3), AL(2), AL(3), AL(3), AL(3), AL(4), AL(4), AL(4), AL(6), AL(6), AL(2), AL(5), AL(5), AL(3), AL(3), |
228e548e6 net: Add sendmmsg... |
706 |
AL(4), AL(5), AL(4) |
c6d409cfd From abbffa2aa9bd... |
707 |
}; |
1da177e4c Linux-2.6.12-rc2 |
708 |
#undef AL |
95c961747 net: cleanup unsi... |
709 |
asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr __user *msg, unsigned int flags) |
1da177e4c Linux-2.6.12-rc2 |
710 |
{ |
a7526eb5d net: Unbreak comp... |
711 712 713 |
if (flags & MSG_CMSG_COMPAT) return -EINVAL; return __sys_sendmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT); |
1da177e4c Linux-2.6.12-rc2 |
714 |
} |
228e548e6 net: Add sendmmsg... |
715 |
asmlinkage long compat_sys_sendmmsg(int fd, struct compat_mmsghdr __user *mmsg, |
95c961747 net: cleanup unsi... |
716 |
unsigned int vlen, unsigned int flags) |
228e548e6 net: Add sendmmsg... |
717 |
{ |
a7526eb5d net: Unbreak comp... |
718 719 |
if (flags & MSG_CMSG_COMPAT) return -EINVAL; |
228e548e6 net: Add sendmmsg... |
720 721 722 |
return __sys_sendmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT); } |
1da177e4c Linux-2.6.12-rc2 |
723 724 |
asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, unsigned int flags) { |
a7526eb5d net: Unbreak comp... |
725 726 727 |
if (flags & MSG_CMSG_COMPAT) return -EINVAL; return __sys_recvmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT); |
1da177e4c Linux-2.6.12-rc2 |
728 |
} |
95c961747 net: cleanup unsi... |
729 |
asmlinkage long compat_sys_recv(int fd, void __user *buf, size_t len, unsigned int flags) |
1dacc76d0 net/compat/wext: ... |
730 731 732 733 734 |
{ return sys_recv(fd, buf, len, flags | MSG_CMSG_COMPAT); } asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len, |
95c961747 net: cleanup unsi... |
735 |
unsigned int flags, struct sockaddr __user *addr, |
1dacc76d0 net/compat/wext: ... |
736 737 738 739 |
int __user *addrlen) { return sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, addr, addrlen); } |
a2e272554 net: Introduce re... |
740 |
asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, |
95c961747 net: cleanup unsi... |
741 |
unsigned int vlen, unsigned int flags, |
60c2ffd3d net: fix compat_s... |
742 |
struct compat_timespec __user *timeout) |
a2e272554 net: Introduce re... |
743 744 745 |
{ int datagrams; struct timespec ktspec; |
a2e272554 net: Introduce re... |
746 |
|
a7526eb5d net: Unbreak comp... |
747 748 |
if (flags & MSG_CMSG_COMPAT) return -EINVAL; |
ee4fa23c4 compat: Use COMPA... |
749 750 751 752 |
if (COMPAT_USE_64BIT_TIME) return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT, (struct timespec *) timeout); |
5b23136bc net: compat_sys_r... |
753 754 755 |
if (timeout == NULL) return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT, NULL); |
de039f02d net: use compat h... |
756 |
if (get_compat_timespec(&ktspec, timeout)) |
a2e272554 net: Introduce re... |
757 758 759 760 |
return -EFAULT; datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT, &ktspec); |
de039f02d net: use compat h... |
761 |
if (datagrams > 0 && put_compat_timespec(&ktspec, timeout)) |
a2e272554 net: Introduce re... |
762 763 764 765 |
datagrams = -EFAULT; return datagrams; } |
1da177e4c Linux-2.6.12-rc2 |
766 767 768 769 770 |
asmlinkage long compat_sys_socketcall(int call, u32 __user *args) { int ret; u32 a[6]; u32 a0, a1; |
4768fbcbc [NET]: Fix whites... |
771 |
|
228e548e6 net: Add sendmmsg... |
772 |
if (call < SYS_SOCKET || call > SYS_SENDMMSG) |
1da177e4c Linux-2.6.12-rc2 |
773 774 775 776 777 |
return -EINVAL; if (copy_from_user(a, args, nas[call])) return -EFAULT; a0 = a[0]; a1 = a[1]; |
4768fbcbc [NET]: Fix whites... |
778 |
|
e71a4783a [NET] core: white... |
779 |
switch (call) { |
1da177e4c Linux-2.6.12-rc2 |
780 781 782 783 784 785 786 787 788 789 790 791 792 |
case SYS_SOCKET: ret = sys_socket(a0, a1, a[2]); break; case SYS_BIND: ret = sys_bind(a0, compat_ptr(a1), a[2]); break; case SYS_CONNECT: ret = sys_connect(a0, compat_ptr(a1), a[2]); break; case SYS_LISTEN: ret = sys_listen(a0, a1); break; case SYS_ACCEPT: |
de11defeb reintroduce accept4 |
793 |
ret = sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0); |
1da177e4c Linux-2.6.12-rc2 |
794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 |
break; case SYS_GETSOCKNAME: ret = sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2])); break; case SYS_GETPEERNAME: ret = sys_getpeername(a0, compat_ptr(a1), compat_ptr(a[2])); break; case SYS_SOCKETPAIR: ret = sys_socketpair(a0, a1, a[2], compat_ptr(a[3])); break; case SYS_SEND: ret = sys_send(a0, compat_ptr(a1), a[2], a[3]); break; case SYS_SENDTO: ret = sys_sendto(a0, compat_ptr(a1), a[2], a[3], compat_ptr(a[4]), a[5]); break; case SYS_RECV: |
1dacc76d0 net/compat/wext: ... |
811 |
ret = compat_sys_recv(a0, compat_ptr(a1), a[2], a[3]); |
1da177e4c Linux-2.6.12-rc2 |
812 813 |
break; case SYS_RECVFROM: |
1dacc76d0 net/compat/wext: ... |
814 815 |
ret = compat_sys_recvfrom(a0, compat_ptr(a1), a[2], a[3], compat_ptr(a[4]), compat_ptr(a[5])); |
1da177e4c Linux-2.6.12-rc2 |
816 817 |
break; case SYS_SHUTDOWN: |
c6d409cfd From abbffa2aa9bd... |
818 |
ret = sys_shutdown(a0, a1); |
1da177e4c Linux-2.6.12-rc2 |
819 820 821 822 823 824 825 826 827 828 829 830 |
break; case SYS_SETSOCKOPT: ret = compat_sys_setsockopt(a0, a1, a[2], compat_ptr(a[3]), a[4]); break; case SYS_GETSOCKOPT: ret = compat_sys_getsockopt(a0, a1, a[2], compat_ptr(a[3]), compat_ptr(a[4])); break; case SYS_SENDMSG: ret = compat_sys_sendmsg(a0, compat_ptr(a1), a[2]); break; |
228e548e6 net: Add sendmmsg... |
831 832 833 |
case SYS_SENDMMSG: ret = compat_sys_sendmmsg(a0, compat_ptr(a1), a[2], a[3]); break; |
1da177e4c Linux-2.6.12-rc2 |
834 835 836 |
case SYS_RECVMSG: ret = compat_sys_recvmsg(a0, compat_ptr(a1), a[2]); break; |
a2e272554 net: Introduce re... |
837 838 839 840 |
case SYS_RECVMMSG: ret = compat_sys_recvmmsg(a0, compat_ptr(a1), a[2], a[3], compat_ptr(a[4])); break; |
de11defeb reintroduce accept4 |
841 842 |
case SYS_ACCEPT4: ret = sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), a[3]); |
aaca0bdca flag parameters: ... |
843 |
break; |
1da177e4c Linux-2.6.12-rc2 |
844 845 846 847 848 849 |
default: ret = -EINVAL; break; } return ret; } |