From nobody Sun Sep 7 12:18:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1474FECAAD5 for ; Fri, 2 Sep 2022 12:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236794AbiIBMcr (ORCPT ); Fri, 2 Sep 2022 08:32:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236439AbiIBMbl (ORCPT ); Fri, 2 Sep 2022 08:31:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C516EE1AB9; Fri, 2 Sep 2022 05:27:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 37B7662178; Fri, 2 Sep 2022 12:27:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44C78C433C1; Fri, 2 Sep 2022 12:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121628; bh=kbqhYeilcXusCl2mgIc1i1PvjLcthAyrfbJIfvIOEj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QuDpzGb8XWWjG0GNaKGC1fjwzIV8V/h/uqv9ifn/e1uCiMT0d5pjnvRQO8TxjI9KF GVR73UIT1qF34ScWmVtyqEgDU03DXrduB6/1m8BvlgY/bFO5GpFGd4G69/vzRvPAIV m0HJ3MTCXMGu6r2LhQVDfsNCzPLkAftJgkltYdd0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 5.4 14/77] SUNRPC: RPC level errors should set task->tk_rpc_status Date: Fri, 2 Sep 2022 14:18:23 +0200 Message-Id: <20220902121404.110025520@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121403.569927325@linuxfoundation.org> References: <20220902121403.569927325@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Trond Myklebust [ Upstream commit ed06fce0b034b2e25bd93430f5c4cbb28036cc1a ] Fix up a case in call_encode() where we're failing to set task->tk_rpc_status when an RPC level error occurred. Fixes: 9c5948c24869 ("SUNRPC: task should be exit if encode return EKEYEXPI= RED more times") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 08e1ccc01e983..1893203cc94fc 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1896,7 +1896,7 @@ call_encode(struct rpc_task *task) break; case -EKEYEXPIRED: if (!task->tk_cred_retry) { - rpc_exit(task, task->tk_status); + rpc_call_rpcerror(task, task->tk_status); } else { task->tk_action =3D call_refresh; task->tk_cred_retry--; --=20 2.35.1