projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more changes that were lost when committing mips dynamic linker
[musl]
/
src
/
network
/
sendmsg.c
diff --git
a/src/network/sendmsg.c
b/src/network/sendmsg.c
index
047c0ef
..
5f08000
100644
(file)
--- a/
src/network/sendmsg.c
+++ b/
src/network/sendmsg.c
@@
-1,21
+1,30
@@
#include <sys/socket.h>
#include <limits.h>
#include <sys/socket.h>
#include <limits.h>
+#include <string.h>
+#include <errno.h>
#include "syscall.h"
#include "libc.h"
ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
{
#include "syscall.h"
#include "libc.h"
ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
{
- ssize_t r;
#if LONG_MAX > INT_MAX
struct msghdr h;
#if LONG_MAX > INT_MAX
struct msghdr h;
+ struct cmsghdr chbuf[1024/sizeof(struct cmsghdr)+1], *c;
if (msg) {
h = *msg;
h.__pad1 = h.__pad2 = 0;
msg = &h;
if (msg) {
h = *msg;
h.__pad1 = h.__pad2 = 0;
msg = &h;
+ if (h.msg_controllen) {
+ if (h.msg_controllen > 1024) {
+ errno = ENOMEM;
+ return -1;
+ }
+ memcpy(chbuf, h.msg_control, h.msg_controllen);
+ h.msg_control = chbuf;
+ for (c=CMSG_FIRSTHDR(&h); c; c=CMSG_NXTHDR(&h,c))
+ c->__pad1 = 0;
+ }
}
#endif
}
#endif
- CANCELPT_BEGIN;
- r = socketcall(sendmsg, fd, msg, flags, 0, 0, 0);
- CANCELPT_END;
- return r;
+ return socketcall_cp(sendmsg, fd, msg, flags, 0, 0, 0);
}
}