mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-27 04:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync with generic Linux version.

Browse Source 
(__cmsg_nxthdr): Use CMSG_ALIGN (fixes a bug) and correct test for availability
of another entry.
This commit is contained in:
Ulrich Drepper 1998-09-28 11:49:19 +00:00
parent d05b46514b
commit 225146fe16
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysdeps/unix/sysv/linux/mips/bits/socket.h
View File

@ -151,6 +151,11 @@ struct cmsghdr
#define CMSG_FIRSTHDR(mhdr) \ #define CMSG_FIRSTHDR(mhdr) \
((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \ ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \
? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL) ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
& ~(sizeof (size_t) - 1))
#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+ CMSG_ALIGN (sizeof (struct cmsghdr)))
#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
#ifndef _EXTERN_INLINE #ifndef _EXTERN_INLINE
@ -161,18 +166,19 @@ extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
_EXTERN_INLINE struct cmsghdr * _EXTERN_INLINE struct cmsghdr *
__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)
{ {
unsigned char *__p;
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr)) if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */ /* The kernel header does this so there may be a reason. */
return NULL; return NULL;
__p = (((unsigned char *) __cmsg) __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ ((__cmsg->cmsg_len + sizeof (long int) - 1) & ~sizeof (long int))); + CMSG_ALIGN (__cmsg->cmsg_len));
if (__p >= (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. */ /* No more entries. */
return NULL; return NULL;
return (struct cmsghdr *) __p; return __cmsg;
} }