mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-01 00:18:15 +01:00
This fixes a compiler warning, and a cosmetic problem with the linux
emul code when compiling with "options KTRACE". ktrsyscall() was expecting an array of integers, this was passing the address of a structure containing an array of integers.. The cosmetic problem was that it was calling the "enter syscall" trace hook twice - this looks like a cut/paste error/typo.
This commit is contained in:
parent
2a4895f4bb
commit
1174c7d121
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=9550
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.55 1995/07/16 05:39:22 davidg Exp $
|
||||
* $Id: trap.c,v 1.56 1995/07/16 10:31:26 joerg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -952,13 +952,9 @@ linux_syscall(frame)
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, (int *)&args);
|
||||
#endif
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
#endif
|
||||
rval[0] = 0;
|
||||
rval[1] = frame.tf_edx;
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.55 1995/07/16 05:39:22 davidg Exp $
|
||||
* $Id: trap.c,v 1.56 1995/07/16 10:31:26 joerg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -952,13 +952,9 @@ linux_syscall(frame)
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, (int *)&args);
|
||||
#endif
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
#endif
|
||||
rval[0] = 0;
|
||||
rval[1] = frame.tf_edx;
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.55 1995/07/16 05:39:22 davidg Exp $
|
||||
* $Id: trap.c,v 1.56 1995/07/16 10:31:26 joerg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -952,13 +952,9 @@ linux_syscall(frame)
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, (int *)&args);
|
||||
#endif
|
||||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, &args);
|
||||
#endif
|
||||
rval[0] = 0;
|
||||
rval[1] = frame.tf_edx;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user