summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1998-04-24 19:47:55 +0000
committerThomas Bushnell <thomas@gnu.org>1998-04-24 19:47:55 +0000
commit248ff8ab4e0849e3ebf6276f0fb05e17eea8fbed (patch)
tree90202395d28b61e018dbdc7332e5d91c460415d6
parent08cc78d452ea0c09c3b7e05565075b6e41769ecc (diff)
Fri Apr 24 15:43:07 1998 Thomas Bushnell, n/BSG <tb@mit.edu>
* io-ops.c (S_io_select): When returning EINTR after cancellation, deallocate REPLY because the stub won't do it for us. Reported by UCHIYAMA Yasushi (uch@nop.or.jp).
-rw-r--r--pfinet/ChangeLog6
-rw-r--r--pfinet/io-ops.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog
index 89d8f4e0..5654bb3c 100644
--- a/pfinet/ChangeLog
+++ b/pfinet/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 24 15:43:07 1998 Thomas Bushnell, n/BSG <tb@mit.edu>
+
+ * io-ops.c (S_io_select): When returning EINTR after cancellation,
+ deallocate REPLY because the stub won't do it for us. Reported by
+ UCHIYAMA Yasushi (uch@nop.or.jp).
+
1997-08-25 Miles Bader <miles@gnu.ai.mit.edu>
* io-ops.c (S_io_write): Negate linux error codes before returning.
diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
index 147e52b0..2261bf9f 100644
--- a/pfinet/io-ops.c
+++ b/pfinet/io-ops.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -306,6 +306,7 @@ S_io_select (struct sock_user *user,
if (cancel)
{
mutex_unlock (&global_lock);
+ mach_port_deallocate (mach_task_self (), reply);
return EINTR;
}
}