[1/2] rpcbproc_callit_com: Stop freeing a static pointer.
diff mbox

Message ID 20170525203531.4471-1-steved@redhat.com
State New
Headers show

Commit Message

Steve Dickson May 25, 2017, 8:35 p.m. UTC
commit 7ea36ee introduced a svc_freeargs() call
that ended up freeing static pointer.

It turns out the allocations for the rmt_args
is not necessary . The xdr routines (xdr_bytes) will
handle the memory management and the largest
possible message size is UDPMSGSIZE (due to UDP only)
which is smaller than RPC_BUF_MAX

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 src/rpcb_svc_com.c | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

Comments

Steve Dickson May 30, 2017, 4:45 p.m. UTC | #1
On 05/25/2017 04:35 PM, Steve Dickson wrote:
> commit 7ea36ee introduced a svc_freeargs() call
> that ended up freeing static pointer.
> 
> It turns out the allocations for the rmt_args
> is not necessary . The xdr routines (xdr_bytes) will
> handle the memory management and the largest
> possible message size is UDPMSGSIZE (due to UDP only)
> which is smaller than RPC_BUF_MAX
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed.... 

steved.
> ---
>  src/rpcb_svc_com.c | 39 ++++++---------------------------------
>  1 file changed, 6 insertions(+), 33 deletions(-)
> 
> diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
> index cb63afd..1fc2229 100644
> --- a/src/rpcb_svc_com.c
> +++ b/src/rpcb_svc_com.c
> @@ -612,9 +612,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
>  	struct netconfig *nconf;
>  	struct netbuf *caller;
>  	struct r_rmtcall_args a;
> -	char *buf_alloc = NULL, *outbufp;
> +	char *outbufp;
>  	char *outbuf_alloc = NULL;
> -	char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
> +	char  outbuf[RPC_BUF_MAX];
>  	struct netbuf *na = (struct netbuf *) NULL;
>  	struct rpc_msg call_msg;
>  	int outlen;
> @@ -635,36 +635,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
>  	}
>  	if (si.si_socktype != SOCK_DGRAM)
>  		return;	/* Only datagram type accepted */
> -	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
> -	if (sendsz == 0) {	/* data transfer not supported */
> -		if (reply_type == RPCBPROC_INDIRECT)
> -			svcerr_systemerr(transp);
> -		return;
> -	}
> -	/*
> -	 * Should be multiple of 4 for XDR.
> -	 */
> -	sendsz = ((sendsz + 3) / 4) * 4;
> -	if (sendsz > RPC_BUF_MAX) {
> -#ifdef	notyet
> -		buf_alloc = alloca(sendsz);		/* not in IDR2? */
> -#else
> -		buf_alloc = malloc(sendsz);
> -#endif	/* notyet */
> -		if (buf_alloc == NULL) {
> -			if (debugging)
> -				xlog(LOG_DEBUG,
> -					"rpcbproc_callit_com:  No Memory!\n");
> -			if (reply_type == RPCBPROC_INDIRECT)
> -				svcerr_systemerr(transp);
> -			return;
> -		}
> -		a.rmt_args.args = buf_alloc;
> -	} else {
> -		a.rmt_args.args = buf;
> -	}
> +	sendsz = UDPMSGSIZE;
>  
>  	call_msg.rm_xid = 0;	/* For error checking purposes */
> +	memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
>  	if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
>  		if (reply_type == RPCBPROC_INDIRECT)
>  			svcerr_decode(transp);
> @@ -704,7 +678,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
>  	if (rbl == (rpcblist_ptr)NULL) {
>  #ifdef RPCBIND_DEBUG
>  		if (debugging)
> -			xlog(LOG_DEBUG, "not found\n");
> +			xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", 
> +				a.rmt_prog, a.rmt_vers);
>  #endif
>  		if (reply_type == RPCBPROC_INDIRECT)
>  			svcerr_noprog(transp);
> @@ -937,8 +912,6 @@ out:
>  	}
>  	if (local_uaddr)
>  		free(local_uaddr);
> -	if (buf_alloc)
> -		free(buf_alloc);
>  	if (outbuf_alloc)
>  		free(outbuf_alloc);
>  	if (na) {
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
index cb63afd..1fc2229 100644
--- a/src/rpcb_svc_com.c
+++ b/src/rpcb_svc_com.c
@@ -612,9 +612,9 @@  rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
 	struct netconfig *nconf;
 	struct netbuf *caller;
 	struct r_rmtcall_args a;
-	char *buf_alloc = NULL, *outbufp;
+	char *outbufp;
 	char *outbuf_alloc = NULL;
-	char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
+	char  outbuf[RPC_BUF_MAX];
 	struct netbuf *na = (struct netbuf *) NULL;
 	struct rpc_msg call_msg;
 	int outlen;
@@ -635,36 +635,10 @@  rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
 	}
 	if (si.si_socktype != SOCK_DGRAM)
 		return;	/* Only datagram type accepted */
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
-	if (sendsz == 0) {	/* data transfer not supported */
-		if (reply_type == RPCBPROC_INDIRECT)
-			svcerr_systemerr(transp);
-		return;
-	}
-	/*
-	 * Should be multiple of 4 for XDR.
-	 */
-	sendsz = ((sendsz + 3) / 4) * 4;
-	if (sendsz > RPC_BUF_MAX) {
-#ifdef	notyet
-		buf_alloc = alloca(sendsz);		/* not in IDR2? */
-#else
-		buf_alloc = malloc(sendsz);
-#endif	/* notyet */
-		if (buf_alloc == NULL) {
-			if (debugging)
-				xlog(LOG_DEBUG,
-					"rpcbproc_callit_com:  No Memory!\n");
-			if (reply_type == RPCBPROC_INDIRECT)
-				svcerr_systemerr(transp);
-			return;
-		}
-		a.rmt_args.args = buf_alloc;
-	} else {
-		a.rmt_args.args = buf;
-	}
+	sendsz = UDPMSGSIZE;
 
 	call_msg.rm_xid = 0;	/* For error checking purposes */
+	memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
 	if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
 		if (reply_type == RPCBPROC_INDIRECT)
 			svcerr_decode(transp);
@@ -704,7 +678,8 @@  rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
 	if (rbl == (rpcblist_ptr)NULL) {
 #ifdef RPCBIND_DEBUG
 		if (debugging)
-			xlog(LOG_DEBUG, "not found\n");
+			xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", 
+				a.rmt_prog, a.rmt_vers);
 #endif
 		if (reply_type == RPCBPROC_INDIRECT)
 			svcerr_noprog(transp);
@@ -937,8 +912,6 @@  out:
 	}
 	if (local_uaddr)
 		free(local_uaddr);
-	if (buf_alloc)
-		free(buf_alloc);
 	if (outbuf_alloc)
 		free(outbuf_alloc);
 	if (na) {