diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
| commit | 5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch) | |
| tree | 31b0b05a41345e9dbf802a309ddf21eb506e8550 /net/socket.c | |
| parent | c6a519d2aac024d8ca5658bddd78af474b274e4b (diff) | |
| parent | 56e9b263242ca80a70abd8831343b268315c27dc (diff) | |
| download | op-kernel-dev-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.zip op-kernel-dev-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index f926447..dbd1a68 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1700,7 +1700,9 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) struct socket *sock; char address[MAX_SOCK_ADDR]; struct iovec iovstack[UIO_FASTIOV], *iov = iovstack; - unsigned char ctl[sizeof(struct cmsghdr) + 20]; /* 20 is size of ipv6_pktinfo */ + unsigned char ctl[sizeof(struct cmsghdr) + 20] + __attribute__ ((aligned (sizeof(__kernel_size_t)))); + /* 20 is size of ipv6_pktinfo */ unsigned char *ctl_buf = ctl; struct msghdr msg_sys; int err, ctl_len, iov_size, total_len; |
