diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-07-31 20:32:01 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-07-31 20:32:01 +0000 |
| commit | ad71126b24491c31fd99b4ca8010cd1363f1c016 (patch) | |
| tree | b788d320c7c35e7b1eaca2e18973d55b3a5b2242 /sysdeps/unix/sysv/linux/cmsg_nxthdr.c | |
| parent | 34183f57d75b4e8b9ed6608f888f0f1e1ada8b34 (diff) | |
Update.
* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Correct
test for cmsg struct size.
* sysdeps/unix/sysv/linux/bits/socket.h (__cmsg_nxthdr): Likewise.
* sysdeps/unix/sysv/linux/i386/makecontext.S: Remove unnecessary
initializations.
* libio/oldiopopen.c: Add lock for old_proc_file_chain access.
Diffstat (limited to 'sysdeps/unix/sysv/linux/cmsg_nxthdr.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/cmsg_nxthdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c index 22daab5ee3..b7de285e34 100644 --- a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c +++ b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c @@ -29,8 +29,8 @@ __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg) cmsg = (struct cmsghdr *) ((unsigned char *) cmsg + CMSG_ALIGN (cmsg->cmsg_len)); - if ((unsigned char *) (cmsg + 1) >= ((unsigned char *) mhdr->msg_control - + mhdr->msg_controllen) + 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. */ |