Deleted Added
full compact
kern_exec.c (195104) kern_exec.c (195926)
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 195104 2009-06-27 13:58:44Z rwatson $");
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 195926 2009-07-28 21:52:24Z rwatson $");
29
30#include "opt_hwpmc_hooks.h"
31#include "opt_kdtrace.h"
32#include "opt_ktrace.h"
33#include "opt_vm.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 377 unchanged lines hidden (view full) ---

414 imgp->vp = binvp;
415 } else {
416 AUDIT_ARG_FD(args->fd);
417 error = fgetvp(td, args->fd, &binvp);
418 if (error)
419 goto exec_fail;
420 vfslocked = VFS_LOCK_GIANT(binvp->v_mount);
421 vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY);
29
30#include "opt_hwpmc_hooks.h"
31#include "opt_kdtrace.h"
32#include "opt_ktrace.h"
33#include "opt_vm.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 377 unchanged lines hidden (view full) ---

414 imgp->vp = binvp;
415 } else {
416 AUDIT_ARG_FD(args->fd);
417 error = fgetvp(td, args->fd, &binvp);
418 if (error)
419 goto exec_fail;
420 vfslocked = VFS_LOCK_GIANT(binvp->v_mount);
421 vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY);
422 AUDIT_ARG_VNODE(binvp, ARG_VNODE1);
422 AUDIT_ARG_VNODE1(binvp);
423 imgp->vp = binvp;
424 }
425
426 /*
427 * Check file permissions (also 'opens' file)
428 */
429 error = exec_check_permissions(imgp);
430 if (error)

--- 991 unchanged lines hidden ---
423 imgp->vp = binvp;
424 }
425
426 /*
427 * Check file permissions (also 'opens' file)
428 */
429 error = exec_check_permissions(imgp);
430 if (error)

--- 991 unchanged lines hidden ---