From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:58219 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbaE1Srf (ORCPT ); Wed, 28 May 2014 14:47:35 -0400 From: Steve Dickson To: Libtirpc-devel Mailing List Cc: Linux NFS Mailing list Subject: [PATCH V2] Avoid buffer overruns by allocating buffer in svcauth_gss_validate() Date: Wed, 28 May 2014 14:47:25 -0400 Message-Id: <1401302845-11496-1-git-send-email-steved@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Signed-off-by: Steve Dickson --- src/svc_auth_gss.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c index 601a691..0766959 100644 --- a/src/svc_auth_gss.c +++ b/src/svc_auth_gss.c @@ -286,21 +286,21 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg) struct opaque_auth *oa; gss_buffer_desc rpcbuf, checksum; OM_uint32 maj_stat, min_stat, qop_state; - u_char rpchdr[128]; + u_char *rpchdr; int32_t *buf; + u_int bufsz; gss_log_debug("in svcauth_gss_validate()"); - memset(rpchdr, 0, sizeof(rpchdr)); - /* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */ oa = &msg->rm_call.cb_cred; - if (oa->oa_length > MAX_AUTH_BYTES) + + bufsz = ((8 * BYTES_PER_XDR_UNIT) + RNDUP(oa->oa_length)); + if (bufsz > MAX_AUTH_BYTES) return (FALSE); - /* 8 XDR units from the IXDR macro calls. */ - if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT + - RNDUP(oa->oa_length))) + rpchdr = (u_char *)calloc(bufsz, 1); + if (rpchdr == NULL) return (FALSE); buf = (int32_t *)rpchdr; -- 1.7.1