From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753428AbdBOXLH (ORCPT ); Wed, 15 Feb 2017 18:11:07 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:53697 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753857AbdBOXLE (ORCPT ); Wed, 15 Feb 2017 18:11:04 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Scott Bauer" , "Jens Axboe" , "Sagi Grimberg" , "Keith Busch" , "Christoph Hellwig" Date: Wed, 15 Feb 2017 22:41:40 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 237/306] nvme/pci: Don't free queues on error In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.40-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Keith Busch commit d48756228ee9161ac8836b346589a43fabdc9f3c upstream. The nvme_remove function tears down all allocated resources in the correct order, so no need to free queues on error during initialization. This fixes possible use-after-free errors when queues are still associated with a blk-mq hctx. Reported-by: Scott Bauer Tested-by: Scott Bauer Signed-off-by: Keith Busch Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe [bwh: Backported to 3.16: - Adjust filename, context - Only nvme_setup_io_queues() needs to be fixed] Signed-off-by: Ben Hutchings --- --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2196,7 +2196,7 @@ static int nvme_setup_io_queues(struct n result = queue_request_irq(dev, adminq, adminq->irqname); if (result) { adminq->q_suspended = 1; - goto free_queues; + return result; } /* Free previously allocated queues that are no longer usable */ @@ -2204,10 +2204,6 @@ static int nvme_setup_io_queues(struct n nvme_assign_io_queues(dev); return 0; - - free_queues: - nvme_free_queues(dev, 1); - return result; } /*