From e03625d66647664d28055be13d3e625aac875542 Mon Sep 17 00:00:00 2001
From: "Michael I. Bushnell" <mib@gnu.org>
Date: Tue, 4 Apr 1995 18:31:47 +0000
Subject: (diskfs_S_file_exec): Using MOVE_SEND in call to exec_exec loses,
because it consumes a reference, which will be consumed again by
mach_msg_server if we return an error. So use COPY_SEND instead, and
deallocate the rights ourselves only when we are to return success.
---
libdiskfs/file-exec.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
(limited to 'libdiskfs')
diff --git a/libdiskfs/file-exec.c b/libdiskfs/file-exec.c
index 19c4563f..12897fc2 100644
--- a/libdiskfs/file-exec.c
+++ b/libdiskfs/file-exec.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1993, 1994 Free Software Foundation
+ Copyright (C) 1993, 1994, 1995 Free Software Foundation
This file is part of the GNU Hurd.
@@ -245,12 +245,22 @@ diskfs_S_file_exec (struct protid *cred,
(diskfs_make_peropen (np, O_READ, cred->po->dotdotport),
cred->uids, cred->nuids,
cred->gids, cred->ngids))),
- MACH_MSG_TYPE_MAKE_SEND,
+ MACH_MSG_TYPE_MOVE_SEND,
task, flags, argv, argvlen, envp, envplen,
- fds, MACH_MSG_TYPE_MOVE_SEND, fdslen,
- portarray, MACH_MSG_TYPE_MOVE_SEND, portarraylen,
+ fds, MACH_MSG_TYPE_COPY_SEND, fdslen,
+ portarray, MACH_MSG_TYPE_COPY_SEND, portarraylen,
intarray, intarraylen, deallocnames, deallocnameslen,
destroynames, destroynameslen);
- mach_port_deallocate (mach_task_self (), task);
- return err;
+ if (!err)
+ {
+ int i;
+
+ mach_port_deallocate (mach_task_self (), task);
+ for (i = 0; i < fdslen; i++)
+ mach_port_deallocate (mach_task_self (), fds[i]);
+ for (i = 0; i < portarraylen; i++)
+ mach_port_deallocate (mach_task_self (), portarray[i]);
+ }
+
+ return err;
}
--
cgit v1.2.3