public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] hurd: Only deallocate addrport when it's valid
@ 2023-04-24 20:44 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2023-04-24 20:44 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4c39333050815a33ddf4f3067798ac060eed1e2b
commit 4c39333050815a33ddf4f3067798ac060eed1e2b
Author: Sergey Bugaev <bugaevc@gmail.com>
Date: Sun Apr 23 19:05:47 2023 +0300
hurd: Only deallocate addrport when it's valid
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230423160548.126576-3-bugaevc@gmail.com>
Diff:
---
sysdeps/mach/hurd/recv.c | 3 ++-
sysdeps/mach/hurd/recvfrom.c | 3 ++-
sysdeps/mach/hurd/recvmsg.c | 3 ++-
sysdeps/mach/hurd/sendmsg.c | 5 +++--
sysdeps/mach/hurd/sendto.c | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c
index 3bd5c16fbd..1783e38dcb 100644
--- a/sysdeps/mach/hurd/recv.c
+++ b/sysdeps/mach/hurd/recv.c
@@ -54,7 +54,8 @@ __recv (int fd, void *buf, size_t n, int flags)
if (err)
return __hurd_sockfail (fd, flags, err);
- __mach_port_deallocate (__mach_task_self (), addrport);
+ if (MACH_PORT_VALID (addrport))
+ __mach_port_deallocate (__mach_task_self (), addrport);
__vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen);
if (bufp != buf)
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index 1cd5f91746..6f2c927ab6 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -94,7 +94,8 @@ __recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
else if (addr_len != NULL)
*addr_len = 0;
- __mach_port_deallocate (__mach_task_self (), addrport);
+ if (MACH_PORT_VALID (addrport))
+ __mach_port_deallocate (__mach_task_self (), addrport);
/* Toss control data; we don't care. */
__vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen);
diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
index 39de86f64f..90fd2698c0 100644
--- a/sysdeps/mach/hurd/recvmsg.c
+++ b/sysdeps/mach/hurd/recvmsg.c
@@ -135,7 +135,8 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
else if (message->msg_name != NULL)
message->msg_namelen = 0;
- __mach_port_deallocate (__mach_task_self (), aport);
+ if (MACH_PORT_VALID (aport))
+ __mach_port_deallocate (__mach_task_self (), aport);
if (buf == data)
buf += len;
diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c
index 5871d1d8dd..7106faf0de 100644
--- a/sysdeps/mach/hurd/sendmsg.c
+++ b/sysdeps/mach/hurd/sendmsg.c
@@ -195,8 +195,9 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
message->msg_controllen,
&amount);
LIBC_CANCEL_RESET (cancel_oldtype);
- __mach_port_deallocate (__mach_task_self (),
- aport);
+ if (MACH_PORT_VALID (aport))
+ __mach_port_deallocate (__mach_task_self (),
+ aport);
}
err;
}));
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index 5a960de8ce..777af1c4d6 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -94,7 +94,7 @@ __sendto (int fd,
err;
}));
- if (aport != MACH_PORT_NULL)
+ if (MACH_PORT_VALID (aport))
__mach_port_deallocate (__mach_task_self (), aport);
return err ? __hurd_sockfail (fd, flags, err) : wrote;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-24 20:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-24 20:44 [glibc] hurd: Only deallocate addrport when it's valid Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).