Received-SPF: pass (google.com: domain of linux-nfs+bounces-2746-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 10 Apr 2024 12:38:53 -0400
From: Chuck Lever <chuck.lever@oracle.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Linux Trace Kernel <linux-trace-kernel@vger.kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
        Jeff Layton <jlayton@kernel.org>,
        Anna Schumaker <Anna.Schumaker@netapp.com>, linux-nfs@vger.kernel.org
Subject: Re: [PATCH] SUNRPC: Fix rpcgss_context trace event acceptor field
Message-ID: <ZhbAndktED4NsANF@tissot.1015granger.net>
References: <20240410123813.2b109227@gandalf.local.home>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240410123813.2b109227@gandalf.local.home>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?LtBGjKzlGIp342KpDTI5Iqk//5qKJYroiCVRaEc3aNoU1aN2iLTB3wCYdf6q?=
 =?us-ascii?Q?gq4LfpkytyzqRnIE8QvudfS+otK0P8jbf4hyJPF6CrHToCjTfWuOSx2n5hbj?=
 =?us-ascii?Q?fl60a8Jsxhca3F4IBCcPLK5v1eUS8U6aEQ2uxNYrnv0AQdzsQF3E6GbeIWjk?=
 =?us-ascii?Q?wPOGyCg6+0+/JAQzZJ9mpg4uGBpXsOXDMjqoilcZ6T6t4XDN1VOcSVz6YcvZ?=
 =?us-ascii?Q?RL/12n51r2Fpq6FxzQVXQcEj6rm013EhCJ+bTewtB2IEgxpSUPx0E0Lp/X09?=
 =?us-ascii?Q?5zvWWplbfZm0tevJchhkLsIfewtj95xF5WTIXhy9qJEgpMDdSxm3W1QxKOn3?=
 =?us-ascii?Q?FfZrK6OTfuxXZf+NTnQ/zAA99PLOd7yOwiPr52HswHZAXhdVLJOCjFr3FH5Z?=
 =?us-ascii?Q?HRFJRSzwuYoiUuZKwAYyYhhnKy+qtIPJC0TP2mYhxzmhhckgwjj2xtw6xjkx?=
 =?us-ascii?Q?9vGRhPCQw4Hp6CH8Hs4/9PJF3Axc3dIFdPdC0R0mTqMYgyqCtutAh2jFTrPe?=
 =?us-ascii?Q?rDs0ZWns430YQxcb2mFhYFQGpRsPQX0Y3xUXnVJ8JBCjpCf9VnKR7Fjgzw6e?=
 =?us-ascii?Q?BqQTEfdcK8WxM/K4SFDX31Q9yaYDTplw1mnSL6lAJkO0l2kgMd7Re72LIwND?=
 =?us-ascii?Q?MIoREjxCFnb2AgX5hDzXnOnpceKf/7Ff0QfdYZko0oNzW2cFrdjVDeNNk2op?=
 =?us-ascii?Q?RsBAQIxGHgA4/vpKvN+IyuaryHxpw7HxTmiTiTbLEluUG7lQ0/gFsaH8FgFY?=
 =?us-ascii?Q?IrOs5+qcxfW7jXGkUadQqH0/FrXlYbi5/YHBUpiLcoKQ+HVOAdy3hzA4wPGS?=
 =?us-ascii?Q?r0/9kvnqqJC9hX6HiVEQse7vF256LlMg9Lvx8SAaFp91zEa3VPh464+gYej3?=
 =?us-ascii?Q?/f+0Gcq1k5vOYsaZpy9h7zNxk1OJL40hb0t3AX15QcnYUv711e65m1q9UXeE?=
 =?us-ascii?Q?zPp4DmupjXWXpJOh3IP4uhstImWycVKEMIQnmGRhWAKXshJM9Y8U+woQDQp4?=
 =?us-ascii?Q?jkp1eEwH4b0mK4JeBbDBN16CUDfQigrxZrm9EK5Qj3z5uH3kvxZgVdnusZ/g?=
 =?us-ascii?Q?Q+fTEokWcKOHvc4e+sTQcEGrLgRYi6glBqjaWw/Z6q8BxZY769j8gQem921v?=
 =?us-ascii?Q?gimkNt+YmDuC5Vw/LOxW8C+Cwur9H7Fu/V/obOWG4q8ImnFmHONNipoZM6aH?=
 =?us-ascii?Q?S4IvMnvz6VUyDQKRZXJC/4072wmrwbuMpQKakoDIuNkeQMx7ooZj3XN4IgOC?=
 =?us-ascii?Q?ZCXpqtDa3A17hXdqCoK/9gIWftYgUWyb/bZm4ujrWZR9EAMy+VcdjblFlC3s?=
 =?us-ascii?Q?E/p0WmF9siQLosPTNl8agkXSxpY8aVsyDqAkjISnE733+lq1uGfNeF9O8tgM?=
 =?us-ascii?Q?JY7G87bmb8eTJ+itz9+PCk5sxiJGrdzfTdzWioEUxrkqYKuBH+6qWNoukEE1?=
 =?us-ascii?Q?ThJpy9runofzqvWI0cl0xphE8/FdWiCRlin7/VESwti1UI6ZCSFppobXmc4c?=
 =?us-ascii?Q?2mOGMh6uyhLZw+TWTRMciPzGCA+60hSezdoBv+31dZyZ34FdyXyQnVSiepkJ?=
 =?us-ascii?Q?QRGjKdZgE+0dTrfSQOyKqdaz+xgYw580LJOQOD/z16v8yZsCYHJZpkqj7Yju?=
 =?us-ascii?Q?cA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	j5MgdT0jN0OGlPf+VON/g9QyweWZQZOfBVX08wSOsT/dcTOhf5qqHAIcoolnz8fm2EUPuAm8ekceqZ+tkDf3BxAF+CfAo0MaCeMwmUHqCTxdX/k8QclRoxoiNLGvKWCvHUhTfTUSbYj6qXnP7CZGOBbuHykJmA+urXWsUuZusLn2iUKLMBcn3WlIBO9klVvp4cX1FH9G0Ez1VI7mvSErMknl3c4zMxSMfmuaKRakoawe8a5gX9yk29Zr1Vc1qzXATvpJP3WEOJyEXl0Qr89VB1ydgWyNXf24N+yFuiJbJ7YQjx7KNT99j+LcQsNGu1SEhz0gPV1ZSP73U/Fv1o5eRk3Na7mMhccR2SSYfCycAocvMIdcp4pbjXwk31kPnn5WCynQGi2XDXLF3omp6q1bQcadagvxgN7u7124kAjC+Sxo+CjH6xFLnTRdvtuwoHpXdVdmT4IYeSDZQkfq9DhEccbZbKQZmRUmJBb7X/K4I+PFcaa/pSYSI3LfU24d5PbvMZ6oS/8lvL4WBTxQEryXKQuJhzW60a9D9eIWJCEwTSodysyatWdS5YK4VpU/aPgcYuCmFiZWP6STy3v7aSVHoTh4Jmktidg061LCYr9U+Ec=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 11590aa2-4fbb-4199-0b41-08dc597cb70d
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 16:38:56.3060
 (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: +MXx7r6Sfge2/L2XLvN4ewL2dRKYZl+6zQBclBkWv5v66veUL5bk3FIGiKz7zDGjOvPuH/8oSO8hDNjydNIoPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5951
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2404100122
X-Proofpoint-GUID: 7YrT72HvYrXCwSOM1G3_jky9mpEuuj4Y
X-Proofpoint-ORIG-GUID: 7YrT72HvYrXCwSOM1G3_jky9mpEuuj4Y

On Wed, Apr 10, 2024 at 12:38:13PM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
> 
> The rpcgss_context trace event acceptor field is a dynamically sized
> string that records the "data" parameter. But this parameter is also
> dependent on the "len" field to determine the size of the data.
> 
> It needs to use __string_len() helper macro where the length can be passed
> in. It also incorrectly uses strncpy() to save it instead of
> __assign_str(). As these macros can change, it is not wise to open code
> them in trace events.
> 
> As of commit c759e609030c ("tracing: Remove __assign_str_len()"),
> __assign_str() can be used for both __string() and __string_len() fields.
> Before that commit, __assign_str_len() is required to be used. This needs
> to be noted for backporting. (In actuality, commit c1fa617caeb0 ("tracing:
> Rework __assign_str() and __string() to not duplicate getting the string")
> is the commit that makes __string_str_len() obsolete).
> 
> Cc: stable@vger.kernel.org
> Fixes: 0c77668ddb4e7 ("SUNRPC: Introduce trace points in rpc_auth_gss.ko")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

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


> ---
>  include/trace/events/rpcgss.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h
> index ba2d96a1bc2f..f50fcafc69de 100644
> --- a/include/trace/events/rpcgss.h
> +++ b/include/trace/events/rpcgss.h
> @@ -609,7 +609,7 @@ TRACE_EVENT(rpcgss_context,
>  		__field(unsigned int, timeout)
>  		__field(u32, window_size)
>  		__field(int, len)
> -		__string(acceptor, data)
> +		__string_len(acceptor, data, len)
>  	),
>  
>  	TP_fast_assign(
> @@ -618,7 +618,7 @@ TRACE_EVENT(rpcgss_context,
>  		__entry->timeout = timeout;
>  		__entry->window_size = window_size;
>  		__entry->len = len;
> -		strncpy(__get_str(acceptor), data, len);
> +		__assign_str(acceptor, data);
>  	),
>  
>  	TP_printk("win_size=%u expiry=%lu now=%lu timeout=%u acceptor=%.*s",
> -- 
> 2.43.0
> 

-- 
Chuck Lever