about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
commitdfd2464b33ddfcd2706191a340d1737548c5ed19 (patch)
tree9ae7d67d98f13d9c38c54dc97f53ffc5b72c0807 /sysdeps/unix/sysv/linux/cmsg_nxthdr.c
parent090ca0002ff8ee4ca425bc6088cc097f46c67626 (diff)
downloadglibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.tar.gz
glibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.tar.xz
glibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.zip
Update.
	* sysdeps/unix/bsd/poll.c (__poll): Add code to extend sets if any
	passed file descriptor exceeds the size determined by
	getdtablesize.

	* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Update
	from inline version in bits/socket.h.

	* sysdeps/unix/sysv/linux/bits/socket.h: Define __cmsg_nxthdr as
	inline function only is __USE_EXTERN_INLINES is defined.

	* time/strftime.c (my_strftime): Make code a bit clearer.
	Patch by Paul Eggert <eggert@twinsun.com>.

	by removing SIG_IGN handler for SIGCHLD if necessary.
Diffstat (limited to 'sysdeps/unix/sysv/linux/cmsg_nxthdr.c')
-rw-r--r--sysdeps/unix/sysv/linux/cmsg_nxthdr.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
index 2245db7f25..fda37f37aa 100644
--- a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
+++ b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
@@ -1,5 +1,5 @@
 /* Return point to next ancillary data entry in message header.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,16 +23,17 @@
 struct cmsghdr *
 __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
 {
-  unsigned char *p;
-
   if ((size_t) cmsg->cmsg_len < sizeof (struct cmsghdr))
     /* The kernel header does this so there may be a reason.  */
     return NULL;
 
-  p = (((unsigned char *) cmsg)
-       + ((cmsg->cmsg_len + sizeof (long int) - 1) & ~sizeof (long int)));
-  if (p >= (unsigned char *) mhdr->msg_control + mhdr->msg_controllen)
+  cmsg = (struct cmsghdr *) ((unsigned char *) cmsg
+			     + CMSG_ALIGN (cmsg->cmsg_len));
+  if ((unsigned char *) (cmsg + 1) >= ((unsigned char *) mhdr->msg_control
+				       + mhdr->msg_controllen)
+      || ((unsigned char *) cmsg + CMSG_ALIGN (cmsg->cmsg_len)
+	  >= ((unsigned char *) mhdr->msg_control + mhdr->msg_controllen)))
     /* No more entries.  */
     return NULL;
-  return (struct cmsghdr *) p;
+  return cmsg;
 }