Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add LINUX_CMSG_{SPACE,LEN} macros. Use then when calculating the

Browse Source 
msg_controllen size, when converting the control message buffer from
native (previous version was missing the linux_cmsghdr size).
This commit is contained in:
njoly 2009-06-16 23:17:02 +00:00
parent 83618982c2
commit cb90fdddc4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/linux/common/linux_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_socket.c,v 1.102 2009/06/16 22:56:49 njoly Exp $ */
/* $NetBSD: linux_socket.c,v 1.103 2009/06/16 23:17:02 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.102 2009/06/16 22:56:49 njoly Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.103 2009/06/16 23:17:02 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@ -669,11 +669,11 @@ linux_copyout_msg_control(struct lwp *l, struct msghdr *mp, struct mbuf *control
break;
}
m = m->m_next;
if (m == NULL || q + LINUX_CMSG_ALIGN(dlen) > q_end) {
q += dlen;
if (m == NULL || q + LINUX_CMSG_SPACE(dlen) > q_end) {
q += LINUX_CMSG_LEN(dlen);
break;
}
q += LINUX_CMSG_ALIGN(dlen);
q += LINUX_CMSG_SPACE(dlen);
}
done:

6
sys/compat/linux/common/linux_socket.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_socket.h,v 1.16 2008/04/28 20:23:44 martin Exp $ */
/* $NetBSD: linux_socket.h,v 1.17 2009/06/16 23:17:02 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -179,6 +179,10 @@ struct linux_cmsghdr {
((mhdr)->msg_controllen >= sizeof(struct linux_cmsghdr) ? \
(struct linux_cmsghdr *)(mhdr)->msg_control : NULL)
#define LINUX_CMSG_SPACE(l) \
(sizeof(struct linux_cmsghdr) + LINUX_CMSG_ALIGN(l))
#define LINUX_CMSG_LEN(l) \
(sizeof(struct linux_cmsghdr) + (l))
/*
* Machine specific definitions.