aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--nscd/nscd_helper.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b5dfc68d5..4e3dd23084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2004-09-12 Ulrich Drepper <drepper@redhat.com>
+ * nscd/nscd_helper.c (get_mapping): Correctly check cmsg length.
+ Avoid file descriptor leak in case of size mismatch.
+
* nscd/nscd-client.h: Fix database structure layout for biarch.
* nscd/mem.c (gc): Add casts to avoid warnings.
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 74983b9762..ff27b0797e 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -138,10 +138,12 @@ get_mapping (request_type type, const char *key,
/* Failure or timeout. */
goto out_close2;
- if (TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, 0)) != keylen
- || msg.msg_controllen != CMSG_LEN (sizeof (int)))
+ if (TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, 0)) != keylen)
goto out_close2;
+ if (CMSG_FIRSTHDR (&msg)->cmsg_len != CMSG_LEN (sizeof (int)))
+ goto out_close;
+
mapfd = *(int *) CMSG_DATA (cmsg);
struct stat64 st;