Attachment 608097 Details for Bug 852827 – Patch - fix initialization in rpc create_client()

[patch] Patch - fix initialization in rpc create_client()

autofs-5.0.6-fix-initialization-in-rpc-create_client.patch (text/plain), 1.84 KB, created by Ian Kent on 2012-08-30 09:34:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2012-08-30 09:34:50 UTC

Size: 1.84 KB

patch

obsolete

>autofs-5.0.6 - fix initialization in rpc create_client()
>
>From: Ian Kent <ikent@redhat.com>
>
>Sometimes the RPC function create_client() gets a non-null stack
>variable passed in which can cause a SEGV. Fix it by initializing
>the passed in variable.
>---
>
> CHANGELOG      |    1 +
> lib/rpc_subs.c |   11 ++++++++---
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
>
>--- autofs-5.0.6.orig/CHANGELOG
>+++ autofs-5.0.6/CHANGELOG
>@@ -19,6 +19,7 @@
> - fix ipv6 configure check.
> - fix nfs4 contacts portmap.
> - fix ipv6 proximity calculation.
>+- fix initialization in rpc create_client().
> 
> 28/06/2011 autofs-5.0.6
> -----------------------
>--- autofs-5.0.6.orig/lib/rpc_subs.c
>+++ autofs-5.0.6/lib/rpc_subs.c
>@@ -333,6 +333,7 @@ static CLIENT *create_client(struct conn
> 	int fd, ret;
> 
> 	fd = RPC_ANYSOCK;
>+	*client = NULL;
> 
> 	if (info->client) {
> 		if (!clnt_control(info->client, CLGET_FD, (char *) &fd)) {
>@@ -359,7 +360,10 @@ static CLIENT *create_client(struct conn
> 	memset(&hints, 0, sizeof(hints));
> 	hints.ai_flags = AI_ADDRCONFIG;
> 	hints.ai_family = AF_UNSPEC;
>-	hints.ai_socktype = SOCK_DGRAM;
>+	if (info->proto->p_proto == IPPROTO_UDP)
>+		hints.ai_socktype = SOCK_DGRAM;
>+	else
>+		hints.ai_socktype = SOCK_STREAM;
> 
> 	ret = getaddrinfo(info->host, NULL, &hints, &ai);
> 	if (ret) {
>@@ -390,11 +394,12 @@ static CLIENT *create_client(struct conn
> 
> 	freeaddrinfo(ai);
> 
>+done:
> 	if (!client) {
> 		info->client = NULL;
> 		goto out_close;
> 	}
>-done:
>+
> 	/* Close socket fd on destroy, as is default for rpcowned fds */
> 	if  (!clnt_control(client, CLSET_FD_CLOSE, NULL)) {
> 		clnt_destroy(client);
>@@ -799,7 +804,7 @@ static int rpc_get_exports_proto(struct
> 				 (xdrproc_t) xdr_void, NULL,
> 				 (xdrproc_t) xdr_exports, (caddr_t) exp,
> 				 info->timeout);
>-		if (status != RPC_PROGVERSMISMATCH)
>+		if (status == RPC_SUCCESS)
> 			break;
> 		if (++vers_entry > 2)
> 			break;

Actions: View | Diff

Attachments on bug 852827: 608097 | 608130