Attachment 5656 Details for Bug 7354 – Patch for v3-5

[patch] Patch for v3-5

tmp.diff (text/plain), 10.42 KB, created by Stefan Metzmacher on 2010-04-26 02:40:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-04-26 02:40:47 UTC

Size: 10.42 KB

patch

obsolete

>From d5213f4a452a1c908f246a7dca8a139f9ce29344 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 23 Dec 2009 19:31:41 +0100
>Subject: [PATCH 1/3] tsocket: allow AF_UNIX sockaddrs smaller than sizeof(sockaddr_un)
>
>This is needed as getpeername() truncates the length to 2 if the
>peer socket has no name.
>
>metze
>(cherry picked from commit 4784c8c3bea98592486ca973d57c99671eb68cb2)
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> lib/tsocket/tsocket_bsd.c |    9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
>index 201788e..6f6b422 100644
>--- a/lib/tsocket/tsocket_bsd.c
>+++ b/lib/tsocket/tsocket_bsd.c
>@@ -210,12 +210,13 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
> 	struct tsocket_address *addr;
> 	struct tsocket_address_bsd *bsda;
> 
>+	if (sa_socklen < sizeof(sa->sa_family)) {
>+		errno = EINVAL;
>+		return -1;
>+	}
>+
> 	switch (sa->sa_family) {
> 	case AF_UNIX:
>-		if (sa_socklen < sizeof(struct sockaddr_un)) {
>-			errno = EINVAL;
>-			return -1;
>-		}
> 		break;
> 	case AF_INET:
> 		if (sa_socklen < sizeof(struct sockaddr_in)) {
>-- 
>1.6.3.3
>
>
>From 51caab1088164a9230ea9418ec5f0ad27dd4e310 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 23 Dec 2009 19:34:32 +0100
>Subject: [PATCH 2/3] tsocket: only copy the specific part of sockaddr*
>
>This makes sure we fill the unspefic bytes with 0
>and have zero termination for sockaddr_un.
>
>metze
>(cherry picked from commit 17c804a67593cdb4d8646b5be6b50fddf56b3e27)
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> lib/tsocket/tsocket_bsd.c |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
>index 6f6b422..c44ba4e 100644
>--- a/lib/tsocket/tsocket_bsd.c
>+++ b/lib/tsocket/tsocket_bsd.c
>@@ -217,12 +217,16 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
> 
> 	switch (sa->sa_family) {
> 	case AF_UNIX:
>+		if (sa_socklen > sizeof(struct sockaddr_un)) {
>+			sa_socklen = sizeof(struct sockaddr_un);
>+		}
> 		break;
> 	case AF_INET:
> 		if (sa_socklen < sizeof(struct sockaddr_in)) {
> 			errno = EINVAL;
> 			return -1;
> 		}
>+		sa_socklen = sizeof(struct sockaddr_in);
> 		break;
> #ifdef HAVE_IPV6
> 	case AF_INET6:
>@@ -230,6 +234,7 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
> 			errno = EINVAL;
> 			return -1;
> 		}
>+		sa_socklen = sizeof(struct sockaddr_in6);
> 		break;
> #endif
> 	default:
>-- 
>1.6.3.3
>
>
>From eccf4c809a98ebfc66b70392ada94cdbeb16dc4a Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Wed, 7 Apr 2010 10:42:37 +1000
>Subject: [PATCH 3/3] tsocket_bsd: Always use a real length for the sa_socklen, and keep it around
>
>The previous code assumed the OS would happily accept sizeof(struct
>sockaddr_storage).  It seems some versions of Solaris do not like
>this.
>
>Andrew Bartlett
>(cherry picked from commit f1aa4c34bf0bd7d42627024af333963b741babea)
>
>Fix for bug #7354.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> lib/tsocket/tsocket_bsd.c |   84 ++++++++------------------------------------
> 1 files changed, 16 insertions(+), 68 deletions(-)
>
>diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
>index c44ba4e..43defb3 100644
>--- a/lib/tsocket/tsocket_bsd.c
>+++ b/lib/tsocket/tsocket_bsd.c
>@@ -190,6 +190,7 @@ static ssize_t tsocket_bsd_pending(int fd)
> static const struct tsocket_address_ops tsocket_address_bsd_ops;
> 
> struct tsocket_address_bsd {
>+	socklen_t sa_socklen;
> 	union {
> 		struct sockaddr sa;
> 		struct sockaddr_in in;
>@@ -261,6 +262,8 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
> 
> 	memcpy(&bsda->u.ss, sa, sa_socklen);
> 
>+	bsda->sa_socklen = sa_socklen;
>+
> 	*_addr = addr;
> 	return 0;
> }
>@@ -271,42 +274,24 @@ ssize_t tsocket_address_bsd_sockaddr(const struct tsocket_address *addr,
> {
> 	struct tsocket_address_bsd *bsda = talloc_get_type(addr->private_data,
> 					   struct tsocket_address_bsd);
>-	ssize_t rlen = 0;
> 
> 	if (!bsda) {
> 		errno = EINVAL;
> 		return -1;
> 	}
> 
>-	switch (bsda->u.sa.sa_family) {
>-	case AF_UNIX:
>-		rlen = sizeof(struct sockaddr_un);
>-		break;
>-	case AF_INET:
>-		rlen = sizeof(struct sockaddr_in);
>-		break;
>-#ifdef HAVE_IPV6
>-	case AF_INET6:
>-		rlen = sizeof(struct sockaddr_in6);
>-		break;
>-#endif
>-	default:
>-		errno = EAFNOSUPPORT;
>-		return -1;
>-	}
>-
>-	if (sa_socklen < rlen) {
>+	if (sa_socklen < bsda->sa_socklen) {
> 		errno = EINVAL;
> 		return -1;
> 	}
> 
>-	if (sa_socklen > sizeof(struct sockaddr_storage)) {
>+	if (sa_socklen > bsda->sa_socklen) {
> 		memset(sa, 0, sa_socklen);
>-		sa_socklen = sizeof(struct sockaddr_storage);
>+		sa_socklen = bsda->sa_socklen;
> 	}
> 
> 	memcpy(sa, &bsda->u.ss, sa_socklen);
>-	return rlen;
>+	return sa_socklen;
> }
> 
> int _tsocket_address_inet_from_strings(TALLOC_CTX *mem_ctx,
>@@ -588,7 +573,7 @@ static struct tsocket_address *tsocket_address_bsd_copy(const struct tsocket_add
> 
> 	ret = _tsocket_address_bsd_from_sockaddr(mem_ctx,
> 						 &bsda->u.sa,
>-						 sizeof(bsda->u.ss),
>+						 bsda->sa_socklen,
> 						 &copy,
> 						 location);
> 	if (ret != 0) {
>@@ -827,8 +812,6 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
> 	struct tdgram_bsd *bsds = tdgram_context_data(dgram, struct tdgram_bsd);
> 	struct tsocket_address_bsd *bsda;
> 	ssize_t ret;
>-	struct sockaddr *sa = NULL;
>-	socklen_t sa_socklen = 0;
> 	int err;
> 	bool retry;
> 
>@@ -862,18 +845,10 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
> 	}
> 
> 	ZERO_STRUCTP(bsda);
>+	bsda->sa_socklen = sizeof(bsda->u.ss);
> 
>-	sa = &bsda->u.sa;
>-	sa_socklen = sizeof(bsda->u.ss);
>-	/*
>-	 * for unix sockets we can't use the size of sockaddr_storage
>-	 * we would get EINVAL
>-	 */
>-	if (bsda->u.sa.sa_family == AF_UNIX) {
>-		sa_socklen = sizeof(bsda->u.un);
>-	}
>-
>-	ret = recvfrom(bsds->fd, state->buf, state->len, 0, sa, &sa_socklen);
>+	ret = recvfrom(bsds->fd, state->buf, state->len, 0,
>+		       &bsda->u.sa, &bsda->sa_socklen);
> 	err = tsocket_bsd_error_from_errno(ret, errno, &retry);
> 	if (retry) {
> 		/* retry later */
>@@ -1019,14 +994,7 @@ static void tdgram_bsd_sendto_handler(void *private_data)
> 			struct tsocket_address_bsd);
> 
> 		sa = &bsda->u.sa;
>-		sa_socklen = sizeof(bsda->u.ss);
>-		/*
>-		 * for unix sockets we can't use the size of sockaddr_storage
>-		 * we would get EINVAL
>-		 */
>-		if (bsda->u.sa.sa_family == AF_UNIX) {
>-			sa_socklen = sizeof(bsda->u.un);
>-		}
>+		sa_socklen = bsda->sa_socklen;
> 	}
> 
> 	ret = sendto(bsds->fd, state->buf, state->len, 0, sa, sa_socklen);
>@@ -1152,7 +1120,6 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 	bool do_ipv6only = false;
> 	bool is_inet = false;
> 	int sa_fam = lbsda->u.sa.sa_family;
>-	socklen_t sa_socklen = sizeof(lbsda->u.ss);
> 
> 	if (remote) {
> 		rbsda = talloc_get_type_abort(remote->private_data,
>@@ -1169,11 +1136,6 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 			do_reuseaddr = true;
> 			do_bind = true;
> 		}
>-		/*
>-		 * for unix sockets we can't use the size of sockaddr_storage
>-		 * we would get EINVAL
>-		 */
>-		sa_socklen = sizeof(lbsda->u.un);
> 		break;
> 	case AF_INET:
> 		if (lbsda->u.in.sin_port != 0) {
>@@ -1184,7 +1146,6 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 			do_bind = true;
> 		}
> 		is_inet = true;
>-		sa_socklen = sizeof(rbsda->u.in);
> 		break;
> #ifdef HAVE_IPV6
> 	case AF_INET6:
>@@ -1198,7 +1159,6 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 			do_bind = true;
> 		}
> 		is_inet = true;
>-		sa_socklen = sizeof(rbsda->u.in6);
> 		do_ipv6only = true;
> 		break;
> #endif
>@@ -1211,12 +1171,10 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 		sa_fam = rbsda->u.sa.sa_family;
> 		switch (sa_fam) {
> 		case AF_INET:
>-			sa_socklen = sizeof(rbsda->u.in);
> 			do_ipv6only = false;
> 			break;
> #ifdef HAVE_IPV6
> 		case AF_INET6:
>-			sa_socklen = sizeof(rbsda->u.in6);
> 			do_ipv6only = true;
> 			break;
> #endif
>@@ -1290,7 +1248,7 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 	}
> 
> 	if (do_bind) {
>-		ret = bind(fd, &lbsda->u.sa, sa_socklen);
>+		ret = bind(fd, &lbsda->u.sa, lbsda->sa_socklen);
> 		if (ret == -1) {
> 			int saved_errno = errno;
> 			talloc_free(dgram);
>@@ -1306,7 +1264,7 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
> 			return -1;
> 		}
> 
>-		ret = connect(fd, &rbsda->u.sa, sa_socklen);
>+		ret = connect(fd, &rbsda->u.sa, rbsda->sa_socklen);
> 		if (ret == -1) {
> 			int saved_errno = errno;
> 			talloc_free(dgram);
>@@ -1999,7 +1957,6 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 	bool do_ipv6only = false;
> 	bool is_inet = false;
> 	int sa_fam = lbsda->u.sa.sa_family;
>-	socklen_t sa_socklen = sizeof(rbsda->u.ss);
> 
> 	req = tevent_req_create(mem_ctx, &state,
> 				struct tstream_bsd_connect_state);
>@@ -2023,11 +1980,6 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 			do_reuseaddr = true;
> 			do_bind = true;
> 		}
>-		/*
>-		 * for unix sockets we can't use the size of sockaddr_storage
>-		 * we would get EINVAL
>-		 */
>-		sa_socklen = sizeof(rbsda->u.un);
> 		break;
> 	case AF_INET:
> 		if (lbsda->u.in.sin_port != 0) {
>@@ -2038,7 +1990,6 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 			do_bind = true;
> 		}
> 		is_inet = true;
>-		sa_socklen = sizeof(rbsda->u.in);
> 		break;
> #ifdef HAVE_IPV6
> 	case AF_INET6:
>@@ -2052,7 +2003,6 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 			do_bind = true;
> 		}
> 		is_inet = true;
>-		sa_socklen = sizeof(rbsda->u.in6);
> 		do_ipv6only = true;
> 		break;
> #endif
>@@ -2065,12 +2015,10 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 		sa_fam = rbsda->u.sa.sa_family;
> 		switch (sa_fam) {
> 		case AF_INET:
>-			sa_socklen = sizeof(rbsda->u.in);
> 			do_ipv6only = false;
> 			break;
> #ifdef HAVE_IPV6
> 		case AF_INET6:
>-			sa_socklen = sizeof(rbsda->u.in6);
> 			do_ipv6only = true;
> 			break;
> #endif
>@@ -2114,7 +2062,7 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 	}
> 
> 	if (do_bind) {
>-		ret = bind(state->fd, &lbsda->u.sa, sa_socklen);
>+		ret = bind(state->fd, &lbsda->u.sa, lbsda->sa_socklen);
> 		if (ret == -1) {
> 			tevent_req_error(req, errno);
> 			goto post;
>@@ -2126,7 +2074,7 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
> 		goto post;
> 	}
> 
>-	ret = connect(state->fd, &rbsda->u.sa, sa_socklen);
>+	ret = connect(state->fd, &rbsda->u.sa, rbsda->sa_socklen);
> 	err = tsocket_bsd_error_from_errno(ret, errno, &retry);
> 	if (retry) {
> 		/* retry later */
>-- 
>1.6.3.3
>

Flags:

jra: review+
metze: review? (gd)

Actions: View

Attachments on bug 7354: 5656