aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64/amd64
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2020-09-27 18:47:06 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2020-09-27 18:47:06 +0000
commit1e2521ffaef4fd0950686f1302283a92ccf9c978 (patch)
treed671479e6d799f2c03bc05d4197fd02648d39f0a /sys/amd64/amd64
parentc4390e6da671117657ffeaa1b6b5e9ad2d4c0e17 (diff)
downloadsrc-1e2521ffaef4fd0950686f1302283a92ccf9c978.tar.gz
src-1e2521ffaef4fd0950686f1302283a92ccf9c978.zip
Get rid of sa->narg. It serves no purpose; use sa->callp->sy_narg instead.
Reviewed by: kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26458
Notes
Notes: svn path=/head/; revision=366205
Diffstat (limited to 'sys/amd64/amd64')
-rw-r--r--sys/amd64/amd64/trap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 01656a48c105..01519d9a7c16 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -999,15 +999,15 @@ cpu_fetch_syscall_args_fallback(struct thread *td, struct syscall_args *sa)
else
sa->callp = &p->p_sysent->sv_table[sa->code];
- sa->narg = sa->callp->sy_narg;
- KASSERT(sa->narg <= nitems(sa->args), ("Too many syscall arguments!"));
+ KASSERT(sa->callp->sy_narg <= nitems(sa->args),
+ ("Too many syscall arguments!"));
argp = &frame->tf_rdi;
argp += reg;
memcpy(sa->args, argp, sizeof(sa->args[0]) * NARGREGS);
- if (sa->narg > regcnt) {
+ if (sa->callp->sy_narg > regcnt) {
params = (caddr_t)frame->tf_rsp + sizeof(register_t);
error = copyin(params, &sa->args[regcnt],
- (sa->narg - regcnt) * sizeof(sa->args[0]));
+ (sa->callp->sy_narg - regcnt) * sizeof(sa->args[0]));
if (__predict_false(error != 0))
return (error);
}
@@ -1037,10 +1037,10 @@ cpu_fetch_syscall_args(struct thread *td)
return (cpu_fetch_syscall_args_fallback(td, sa));
sa->callp = &p->p_sysent->sv_table[sa->code];
- sa->narg = sa->callp->sy_narg;
- KASSERT(sa->narg <= nitems(sa->args), ("Too many syscall arguments!"));
+ KASSERT(sa->callp->sy_narg <= nitems(sa->args),
+ ("Too many syscall arguments!"));
- if (__predict_false(sa->narg > NARGREGS))
+ if (__predict_false(sa->callp->sy_narg > NARGREGS))
return (cpu_fetch_syscall_args_fallback(td, sa));
memcpy(sa->args, &frame->tf_rdi, sizeof(sa->args[0]) * NARGREGS);