Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retrieve the pathname of the exec'd file before we call sys_execve().

Browse Source 
We cannot rely on using copyinstr() to retrieve the pathname from
user mode after a successful exec, since the user mode address space
is no longer valid (and may not even be accessible).  This worked in
earlier code but was broken by rev 1.7.
This commit is contained in:
pgoyette 2015-11-23 00:47:43 +00:00
parent e2f72a0028
commit 76f6833566
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/filemon/filemon_wrapper.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: filemon_wrapper.c,v 1.9 2015/11/22 01:20:52 pgoyette Exp $ */
/* $NetBSD: filemon_wrapper.c,v 1.10 2015/11/23 00:47:43 pgoyette Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.9 2015/11/22 01:20:52 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.10 2015/11/23 00:47:43 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -71,10 +71,12 @@ filemon_wrapper_execve(struct lwp * l, struct sys_execve_args * uap,
register_t * retval)
{
char fname[MAXPATHLEN];
int error;
int error, cerror;
size_t done;
struct filemon *filemon;
cerror = copyinstr(SCARG(uap, path), fname, sizeof(fname), &done);
if ((error = sys_execve(l, uap, retval)) != EJUSTRETURN)
return error;
@ -82,8 +84,7 @@ filemon_wrapper_execve(struct lwp * l, struct sys_execve_args * uap,
if (filemon == NULL)
return EJUSTRETURN;
error = copyinstr(SCARG(uap, path), fname, sizeof(fname), &done);
if (error)
if (cerror)
goto out;
filemon_printf(filemon, "E %d %s\n", curproc->p_pid, fname);