diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-07-29 07:44:43 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-07-29 07:44:43 +0000 |
| commit | 6b019307f44e0dbb389ad68649826526b790a7cc (patch) | |
| tree | 39dc0437b4b34bd573d3d15da8f6f0ebe54df590 /sys/kern | |
| parent | 2ef0bbd3c7fc67e7baf0a4a9f965ab28f0268895 (diff) | |
| download | FreeBSD-src-6b019307f44e0dbb389ad68649826526b790a7cc.zip FreeBSD-src-6b019307f44e0dbb389ad68649826526b790a7cc.tar.gz | |
Eliminate ARG_UPATH[12] arguments to AUDIT_ARG_UPATH() and instead
provide specific macros, AUDIT_ARG_UPATH1() and AUDIT_ARG_UPATH2()
to capture path information for audit records. This allows us to
move the definitions of ARG_* out of the public audit header file,
as they are an implementation detail of our current kernel-internal
audit record, which may change.
Approved by: re (kensmith)
Obtained from: TrustedBSD Project
MFC after: 1 month
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_lookup.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_mount.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 9fa6c9e..e553ae4 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -164,9 +164,9 @@ namei(struct nameidata *ndp) /* If we are auditing the kernel pathname, save the user pathname. */ if (cnp->cn_flags & AUDITVNODE1) - AUDIT_ARG_UPATH(td, cnp->cn_pnbuf, ARG_UPATH1); + AUDIT_ARG_UPATH1(td, cnp->cn_pnbuf); if (cnp->cn_flags & AUDITVNODE2) - AUDIT_ARG_UPATH(td, cnp->cn_pnbuf, ARG_UPATH2); + AUDIT_ARG_UPATH2(td, cnp->cn_pnbuf); /* * Don't allow empty pathnames. diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 7a13719..f304ec6 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1144,7 +1144,7 @@ unmount(td, uap) } mtx_unlock(&mountlist_mtx); } else { - AUDIT_ARG_UPATH(td, pathbuf, ARG_UPATH1); + AUDIT_ARG_UPATH1(td, pathbuf); mtx_lock(&mountlist_mtx); TAILQ_FOREACH_REVERSE(mp, &mountlist, mntlist, mnt_list) { if (strcmp(mp->mnt_stat.f_mntonname, pathbuf) == 0) |
