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=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 92F12C43613 for ; Thu, 20 Jun 2019 18:17:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65D8F2082C for ; Thu, 20 Jun 2019 18:17:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561054640; bh=zbbJ+n/QIA+V23v39znOaxtd+3fxvubQF/dCTR4+Cec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S0JAjqqVY/8OXhwOir87KxQVMyb9ogfUjAMjTcPcC1ohEGhEWJEuckIdQE1hAm6gd VAf/U4cttRYpY4DwBRd8VfyA5Oi126Ub3YsicHDW0qkoTtqOaTXupBaWSOjH+EWvIq uc89pvLCohL+Fd1FIHSfAvOHAvBz7jBiA/dmlbwQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729920AbfFTSRT (ORCPT ); Thu, 20 Jun 2019 14:17:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729904AbfFTSRP (ORCPT ); Thu, 20 Jun 2019 14:17:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 45CB92084E; Thu, 20 Jun 2019 18:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561054634; bh=zbbJ+n/QIA+V23v39znOaxtd+3fxvubQF/dCTR4+Cec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uylZSdq7GMkzyool9u33r72RhXZrwpHtn9++tfdLnbudkYh9Bw4IVpvbuVSCZJgGu kA+SLW22Clg3GF5jhH9drEXqtBnKgCsjViMK+9gaOoGtVkjHI+Ch1Q7Z5bUnANjYjZ YtnJDoFd1IrN5XSPXTvVFw74cycUmGDVwo4DYL3g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sagi Grimberg , Christoph Hellwig Subject: [PATCH 5.1 96/98] nvme-tcp: fix possible null deref on a timed out io queue connect Date: Thu, 20 Jun 2019 19:58:03 +0200 Message-Id: <20190620174354.249889996@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174349.443386789@linuxfoundation.org> References: <20190620174349.443386789@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sagi Grimberg commit f34e25898a608380a60135288019c4cb6013bec8 upstream. If I/O queue connect times out, we might have freed the queue socket already, so check for that on the error path in nvme_tcp_start_queue. Signed-off-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1423,7 +1423,8 @@ static int nvme_tcp_start_queue(struct n if (!ret) { set_bit(NVME_TCP_Q_LIVE, &ctrl->queues[idx].flags); } else { - __nvme_tcp_stop_queue(&ctrl->queues[idx]); + if (test_bit(NVME_TCP_Q_ALLOCATED, &ctrl->queues[idx].flags)) + __nvme_tcp_stop_queue(&ctrl->queues[idx]); dev_err(nctrl->device, "failed to connect queue: %d ret=%d\n", idx, ret); }