Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Message-ID: <2e43a00c-fc85-597a-c43a-1b46b2b39d49@redhat.com>
Date:   Sat, 7 Oct 2023 07:00:23 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH v2 1/1] gss-api: expose gss major/minor error in
 authgss_refresh()
Content-Language: en-US
To:     Olga Kornievskaia <olga.kornievskaia@gmail.com>
Cc:     linux-nfs@vger.kernel.org,
        libtirpc <libtirpc-devel@lists.sourceforge.net>
References: <20231004173240.46924-1-olga.kornievskaia@gmail.com>
 <20231004173240.46924-2-olga.kornievskaia@gmail.com>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <20231004173240.46924-2-olga.kornievskaia@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 10/4/23 1:32 PM, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
> 
> When the client calls into the libtirpc to establish security
> context, the errors that occurred are squashed. Instead, extend
> authgss_refresh to propagate back the gss major/minor error
> codes to the caller.
> 
> --- v2 fix a compiler warning reported by Steve Dickson
> 
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Committed... (tag libtirpc-1-3-4-rc3)

steved
> ---
>   src/auth_gss.c       | 14 ++++++++------
>   tirpc/rpc/auth_gss.h |  2 ++
>   2 files changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/src/auth_gss.c b/src/auth_gss.c
> index e317664..3127b92 100644
> --- a/src/auth_gss.c
> +++ b/src/auth_gss.c
> @@ -184,6 +184,7 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
>   	AUTH			*auth, *save_auth;
>   	struct rpc_gss_data	*gd;
>   	OM_uint32		min_stat = 0;
> +	rpc_gss_options_ret_t	ret;
>   
>   	gss_log_debug("in authgss_create()");
>   
> @@ -229,8 +230,12 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
>   	save_auth = clnt->cl_auth;
>   	clnt->cl_auth = auth;
>   
> -	if (!authgss_refresh(auth, NULL))
> +	memset(&ret, 0, sizeof(rpc_gss_options_ret_t));
> +	if (!authgss_refresh(auth, &ret)) {
>   		auth = NULL;
> +		sec->major_status = ret.major_status;
> +		sec->minor_status = ret.minor_status;
> +	}
>   	else
>   		authgss_auth_get(auth); /* Reference for caller */
>   
> @@ -619,12 +624,9 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
>   }
>   
>   static bool_t
> -authgss_refresh(AUTH *auth, void *dummy)
> +authgss_refresh(AUTH *auth, void *ret)
>   {
> -	rpc_gss_options_ret_t ret;
> -
> -	memset(&ret, 0, sizeof(ret));
> -	return _rpc_gss_refresh(auth, &ret);
> +	return _rpc_gss_refresh(auth, (rpc_gss_options_ret_t *)ret);
>   }
>   
>   bool_t
> diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
> index f2af6e9..a530d42 100644
> --- a/tirpc/rpc/auth_gss.h
> +++ b/tirpc/rpc/auth_gss.h
> @@ -64,6 +64,8 @@ struct rpc_gss_sec {
>   	rpc_gss_svc_t	svc;		/* service */
>   	gss_cred_id_t	cred;		/* cred handle */
>   	u_int		req_flags;	/* req flags for init_sec_context */
> +	int		major_status;
> +	int		minor_status;
>   };
>   
>   /* Private data required for kernel implementation */