From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74284C433ED for ; Wed, 19 May 2021 19:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 585B6610E9 for ; Wed, 19 May 2021 19:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231259AbhESTao (ORCPT ); Wed, 19 May 2021 15:30:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232036AbhESTan (ORCPT ); Wed, 19 May 2021 15:30:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7D4FF6112F for ; Wed, 19 May 2021 19:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621452563; bh=4Iw2TywW103DL03gD+EAReUQbzFGyoq5tKCeunNjdpw=; h=From:To:Subject:Date:From; b=dlpFcZ4LGpuk8zQRrDQxvo8MH8OM9Z9IY+sWUHKcJ82wtldwlXsFGrYVN838GxOuH z3R5sU89vGKzGjb0MvZYbBb7nZuYTwwsLg5BDCgr6aN3LFm2Wtuxh5EUQ1YINHYnF7 C9OXk6jj6yDp4oawHlD8HsxGPYqakBRM4jRqqGS9ky+4ezVTPdH7UUTmAarJJAmntu ufytoLhb8rVgLjZUHtn6quAY7u2CDUyuB772WrZqmcIkNCXHlpHRHlv4MW1NG1bVDY S2IZaporQEC9FNfvVEYVDnGdUFU5qubwqy4rKF7mXuu6HbWv8QvHOg63Ct6ApkKDem WDbeDXzg+x18g== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: Fix Oops in xs_tcp_send_request() when transport is disconnected Date: Wed, 19 May 2021 15:29:22 -0400 Message-Id: <20210519192922.7219-1-trondmy@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust If a disconnection occurs while we're trying to reply to a server callback, then we may end up calling xs_tcp_send_request() with a NULL value for transport->inet, which trips up the call to tcp_sock_set_cork(). Fixes: d737e5d41870 ("SUNRPC: Set TCP_CORK until the transmit queue is empty") Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 47aa47a2b07c..316d04945587 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1010,6 +1010,8 @@ static int xs_tcp_send_request(struct rpc_rqst *req) kernel_sock_shutdown(transport->sock, SHUT_RDWR); return -ENOTCONN; } + if (!transport->inet) + return -ENOTCONN; xs_pktdump("packet data:", req->rq_svec->iov_base, -- 2.31.1