From be46c97142b9e79c45c8fdf078ac5245813738ba Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 27 Oct 2015 09:26:40 +0100 Subject: swrap: Fix recvmsg() with UDP This worked if the unix path was bigger than sizeof(struct sockaddr_in6). With a short unix socket pathname the buffer was to small to store the address and convert_un_in() failed. Thanks to Grigorij Demidov Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher --- src/socket_wrapper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src') diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 6691738..3c0c279 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -4603,6 +4603,9 @@ static ssize_t swrap_recvmsg(int s, struct msghdr *omsg, int flags) struct swrap_address from_addr = { .sa_socklen = sizeof(struct sockaddr_un), }; + struct swrap_address convert_addr = { + .sa_socklen = sizeof(struct sockaddr_storage), + }; struct socket_info *si; struct msghdr msg; struct iovec tmp; @@ -4661,6 +4664,13 @@ static ssize_t swrap_recvmsg(int s, struct msghdr *omsg, int flags) } #endif + /* + * We convert the unix address to a IP address so we need a buffer + * which can store the address in case of SOCK_DGRAM, see below. + */ + msg.msg_name = &convert_addr.sa; + msg.msg_namelen = convert_addr.sa_socklen; + rc = swrap_recvmsg_after(s, si, &msg, -- cgit