Sat Apr 6 17:27:59 2019 UTC ()
Revert previous.   Instead change ufetch_long() to ufetch_int() in
both calls (and also remove the cast on the earlier).

These replaced fuword, to fetch a register_t (ie: int).


(kre)
diff -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_syscall.c
cvs diff -r1.4 -r1.5 src/sys/compat/freebsd/freebsd_syscall.c (expand / switch to unified diff)

--- src/sys/compat/freebsd/freebsd_syscall.c 2019/04/06 16:22:09 1.4
+++ src/sys/compat/freebsd/freebsd_syscall.c 2019/04/06 17:27:58 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $ */ 1/* $NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Charles M. Hannum. 8 * by Charles M. Hannum.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.4 2019/04/06 16:22:09 kre Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.5 2019/04/06 17:27:58 kre Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/proc.h> 37#include <sys/proc.h>
38#include <sys/signal.h> 38#include <sys/signal.h>
39#include <sys/syscall.h> 39#include <sys/syscall.h>
40#include <sys/syscallvar.h> 40#include <sys/syscallvar.h>
41 41
42#include <uvm/uvm_extern.h> 42#include <uvm/uvm_extern.h>
43 43
44#include <machine/cpu.h> 44#include <machine/cpu.h>
45#include <machine/psl.h> 45#include <machine/psl.h>
46#include <machine/userret.h> 46#include <machine/userret.h>
@@ -78,39 +78,39 @@ freebsd_syscall(struct trapframe *frame) @@ -78,39 +78,39 @@ freebsd_syscall(struct trapframe *frame)
78 l = curlwp; 78 l = curlwp;
79 p = l->l_proc; 79 p = l->l_proc;
80 LWP_CACHE_CREDS(l, p); 80 LWP_CACHE_CREDS(l, p);
81 81
82 code = frame->tf_eax; 82 code = frame->tf_eax;
83 callp = p->p_emul->e_sysent; 83 callp = p->p_emul->e_sysent;
84 params = (char *)frame->tf_esp + sizeof(int); 84 params = (char *)frame->tf_esp + sizeof(int);
85 85
86 switch (code) { 86 switch (code) {
87 case SYS_syscall: 87 case SYS_syscall:
88 /* 88 /*
89 * Code is first argument, followed by actual args. 89 * Code is first argument, followed by actual args.
90 */ 90 */
91 error = ufetch_long((void *)params, (u_long *)&code); 91 error = ufetch_int((void *)params, &code);
92 if (error) 92 if (error)
93 goto bad; 93 goto bad;
94 params += sizeof(int); 94 params += sizeof(int);
95 break; 95 break;
96 case SYS___syscall: 96 case SYS___syscall:
97 /* 97 /*
98 * Like syscall, but code is a quad, so as to maintain 98 * Like syscall, but code is a quad, so as to maintain
99 * quad alignment for the rest of the arguments. 99 * quad alignment for the rest of the arguments.
100 */ 100 */
101 error = ufetch_long((void *)(params + 101 error = ufetch_int((void *)(params +
102 _QUAD_LOWWORD * sizeof(int)), 102 _QUAD_LOWWORD * sizeof(int)),
103 (u_long *)&code); 103 &code);
104 if (error) 104 if (error)
105 goto bad; 105 goto bad;
106 params += sizeof(quad_t); 106 params += sizeof(quad_t);
107 break; 107 break;
108 default: 108 default:
109 break; 109 break;
110 } 110 }
111 111
112 code &= (SYS_NSYSENT - 1); 112 code &= (SYS_NSYSENT - 1);
113 callp += code; 113 callp += code;
114 argsize = callp->sy_argsize; 114 argsize = callp->sy_argsize;
115 if (argsize) { 115 if (argsize) {
116 error = copyin(params, (void *)args, argsize); 116 error = copyin(params, (void *)args, argsize);