Received-SPF: pass (google.com: domain of linux-nfs+bounces-381-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 7 Dec 2023 09:26:08 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Olga Kornievskaia <olga.kornievskaia@gmail.com>
Cc: steved@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH 1/2] gssapi: revert commit f5b6e6fdb1e6
Message-ID: <ZXHWAKswQo9Y5kez@tissot.1015granger.net>
References: <20231206213127.55310-1-olga.kornievskaia@gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231206213127.55310-1-olga.kornievskaia@gmail.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?+37LkcvW+5sV7BOjMJHg87kQ+Yk26fsk6YbqdZKsv0OpLpXrCLw3IGJk7w2b?=
 =?us-ascii?Q?chVO5OI9GsTgsoL1UY002kZvGw0hmO4bI5B5l8MoQNGF8kOo7fGl3V/fTx4U?=
 =?us-ascii?Q?uH8uZVFkCyCI51glwOXPZjPDd0JyV0yIgEvYC+xWGNtrfsJx3y1U+BTRa5S9?=
 =?us-ascii?Q?t9FBRXY88UFuUcu/9Sd8f2NR8dlmQlWsCH3kTWt0s+wbThuiPO0WnAfUMI1S?=
 =?us-ascii?Q?Z8/GlHJ+TFsH6c1AcsCluxOgymxvmu8ota+xVFh5Ra2pmjQ0T4XlPn8DkKFT?=
 =?us-ascii?Q?vxkyxrfzryJOs06pCUenj1+8gdG6v6IMjw6saivN9sYSnwvewUT+bA9q8hJ3?=
 =?us-ascii?Q?9s7PS0MfBDEffZ4zD0jQP/s8jFcJaE70MSNOXTgKx6GPgPfyJagfmhYH8Q0g?=
 =?us-ascii?Q?FBhxbxIctDYbjVEzBy2sYvj7hEEn+b5mS2lIBbtwE8l2fyZOJ7vjfxx6YE4H?=
 =?us-ascii?Q?z152uRu/Du5NxN64NMhWBHunk3+eQsDb8Fq5v9VqmrM08Bi3I6NoW6vemHlo?=
 =?us-ascii?Q?UE4ADZi2GKZLQ1Wu5lwzMtTn7OvT11aifRdoDXUzKrx9XkRurjXJSTqnxCRT?=
 =?us-ascii?Q?+dOPMXt8NtzeDq9DAn4Dxyj3dCXpCqFPAVri6cGmIkyuOIGcRs6m7W+9wVsU?=
 =?us-ascii?Q?/8G/hKVRxM0+Xv+hwjcDcrch2nUcR0fMHSVjhlOcNafB3G6GeX0pPCc/4j2+?=
 =?us-ascii?Q?WxQdfi8DIA1EjqjtcNgAdf+QNM7s+calWDGsCQcqaydS71oydKTJYwMcKiE1?=
 =?us-ascii?Q?c+nx1nGOaGV8KudjBLKoLN+WQcj83x05eMeINwOTuvMBvoEiVAoURpCAoc51?=
 =?us-ascii?Q?RdBwrdFzWbKbHhcp+vSnULsiyM9qZTltSC6dbQx2IBAuWTbjAeIdWIOKXUvF?=
 =?us-ascii?Q?KIsGOTtOlnFfeKhh+mUdaXftYdAfMMUFNmRuFldsAbGVQ7wm5SxYimgpFpxQ?=
 =?us-ascii?Q?qPyaP+0V7wi3emAj2GF8s0gmAI0+7tT/MB6UgPnwWPrch413335C+vtN2CCO?=
 =?us-ascii?Q?XjYPFGepyIlEUsSx13XHbqDTYimcnXZ+IQ5qMrqgOkOxVNnEoq3EHk7e8Jrp?=
 =?us-ascii?Q?7l2DrEcGm++ax91l305ntkVCeT3Uy3Jh/6g8dgv7rzadWTrWdNnEmn+eJRNp?=
 =?us-ascii?Q?wXsUwAyi30NIpM1fKUkZ4QGZw4HPmLAgcB7OQgjwBIQhAWpzCtPEQk3wlg8f?=
 =?us-ascii?Q?po+Tvc7U4jNViXUPk9SyDBOJhiPnIm7M72D2lSsNQOHL3duhW86YVntJaIzy?=
 =?us-ascii?Q?0Ki/E4zp45Bpbo4ndPBmeSIGWRIC2xc/yvGuWVfKgswbT1s8PpxwE2x4MzIt?=
 =?us-ascii?Q?IW29CiiC1nOZPfcNopioZgfK3ofF3V5Jl+uqVP6sSuoYU8OC7IlswE41vTny?=
 =?us-ascii?Q?QM49DeXCvG7hFM3ZpGQba0+QSjlglRoBpbpKgYwebJmBEj+P5DBNCV6knnoe?=
 =?us-ascii?Q?0UE6fZEO5xx55dfkyLpxU+fckN7fGZERoMsbc9o8svUlfS5sNom1UCDdpekn?=
 =?us-ascii?Q?9JeKX3uK98z2t6D+u9xpRDnq0C4gIuYPwedOKZ3C6Oh7HZOwU8Dmd45GkJvT?=
 =?us-ascii?Q?46azrPa8398qXHVofL1iMZwcRVekPaNpoORZ8rH5Eg43oFnYRViUjV2xzH8y?=
 =?us-ascii?Q?vw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	TpM34GSrUW0UjwYJ9BmI53DCgqhPIPvKlNEiw6SqCJWSgSTGMiO/WQndwmHiCYVODKmtpnD8XE3RoJ75PC9M/g1nifcuaWPIQgiL8dIjo4pca0z9sHNAa1jMBsM4oieLqE3+l3xC6Gj5MXZ2FK72zq45xGV6VYj+ERW7xbW/fRwS/jGKD2ak68A7aX0CtxwzvYLW7qGRFquEzUhcXoMTUmvAULcvhGrpfapmFpbH9fFVm5LfkyCCgye7dr0MlKg4PD2dtq9dTzoAnSJaJmxTYdmK9ahuKCysFXgs7XXh/uR/U8NWvqCZm7eGFv8dTKXfZ3XqSyZkU0Wo7GcQciZfU04+RH1vdhKNH8Z8mzbufgbRv9MC0byA2PlnLKxeQ88tow14Q/Z1Xs7go9mlVyr0a7YUa1D+SrDXD2Yw5XbemUQMKRuTxms2pbZm037RV9LtEBOx0oMN2dKMI6qNRXNlRf97lqe7xZicZAmjLCcGlzmKEdp7617DTXun98q3nmonafo9qa5NgAdb5f6Au7BR820Q9ZQhZaQnuqY3tQ2FC86NJAWCuPNLDXUl/i3anfQRTbRbTXWOqw/BPYZRbA69ckXVy3IQTwPaML8oAMRkwPJZnotb9c496NuL+ml5+GYeD9ttodM68GLdib9lzc7VwpmHGRj13DsV5Y7rW6T2pCludWyiKhmMRAPe0/x9Bi4CWLoATTts7HVBu55GJswxNcsi6vqz4XpSLygEUEt0HESTu24DXnFMWAxmc0zQXjw7W3CYShJVlkoSUM9LmmPIYM2dIC7pcaI3cxUv98YSRDaW2SeNq5RNjsgTOqI/V8Qv
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3624cf4a-a01c-4528-3984-08dbf73075d2
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 14:26:11.1621
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: MmcLMgr8OGabt90revq5rI8W9rMk6fz3UAm8x+o4hWIj1gKTPsF3Aat30/fcaNPwFdEW21LBnP1haFBeRMfYtA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4675
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-12-07_12,2023-12-07_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0
 suspectscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2312070118
X-Proofpoint-GUID: AwjPCw_XrsSA9iG7ifnjxSlXZg6PoeYm
X-Proofpoint-ORIG-GUID: AwjPCw_XrsSA9iG7ifnjxSlXZg6PoeYm

On Wed, Dec 06, 2023 at 04:31:26PM -0500, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
> 
> Revert commit f5b6e6fdb1e6 "gss-api: expose gss major/minor error in
> authgss_refresh()".
> 
> Instead of modifying existing api, use rpc_gss_seccreate() which exposes
> the error values.
> 
> Signed-off-by: Olga Kornievskaia <kolga@netapp.umich>

Reviewed-by: Chuck Lever <chuck.lever@oracle.com>


> ---
>  src/auth_gss.c       | 14 ++++++--------
>  tirpc/rpc/auth_gss.h |  2 --
>  2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/src/auth_gss.c b/src/auth_gss.c
> index 3127b92..e317664 100644
> --- a/src/auth_gss.c
> +++ b/src/auth_gss.c
> @@ -184,7 +184,6 @@ 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()");
>  
> @@ -230,12 +229,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
>  	save_auth = clnt->cl_auth;
>  	clnt->cl_auth = auth;
>  
> -	memset(&ret, 0, sizeof(rpc_gss_options_ret_t));
> -	if (!authgss_refresh(auth, &ret)) {
> +	if (!authgss_refresh(auth, NULL))
>  		auth = NULL;
> -		sec->major_status = ret.major_status;
> -		sec->minor_status = ret.minor_status;
> -	}
>  	else
>  		authgss_auth_get(auth); /* Reference for caller */
>  
> @@ -624,9 +619,12 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
>  }
>  
>  static bool_t
> -authgss_refresh(AUTH *auth, void *ret)
> +authgss_refresh(AUTH *auth, void *dummy)
>  {
> -	return _rpc_gss_refresh(auth, (rpc_gss_options_ret_t *)ret);
> +	rpc_gss_options_ret_t ret;
> +
> +	memset(&ret, 0, sizeof(ret));
> +	return _rpc_gss_refresh(auth, &ret);
>  }
>  
>  bool_t
> diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
> index a530d42..f2af6e9 100644
> --- a/tirpc/rpc/auth_gss.h
> +++ b/tirpc/rpc/auth_gss.h
> @@ -64,8 +64,6 @@ 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 */
> -- 
> 2.39.1
> 

-- 
Chuck Lever