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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 9F522C4360F for ; Mon, 18 Feb 2019 14:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6494320838 for ; Mon, 18 Feb 2019 14:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550500883; bh=5+Tg6BXsZkSFr7eUcHOT6+9KfBiybyIGZaVL0m7nr2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=thfGZcZk5jh7grbof5fiPi+VNh6Q2ajCedL46phAfoS76XSqQD+UKTvh5J/bIIl98 iXpIni+3POSzL9XUvzaZpbpJlxxwRcAg1oNzQ6LVcEtWWd6M4AHJJSvrlkxQq0gA2h zICC+SNRH+iYzhKk8jAtzvMir+26R6AWqBl3cimk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732088AbfBRNvM (ORCPT ); Mon, 18 Feb 2019 08:51:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:59026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732124AbfBRNvK (ORCPT ); Mon, 18 Feb 2019 08:51:10 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 3EB5B21901; Mon, 18 Feb 2019 13:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497869; bh=5+Tg6BXsZkSFr7eUcHOT6+9KfBiybyIGZaVL0m7nr2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzaoHkGor9kjpA5j1/+AKN+Ui35Dq0m0q7pkPajcT6t5FnfrOjygmfXtFiQSWQMC/ l50KxhH0FS6A7uvNoNrqAeupY0ii8CZiK0i1E6PlEbZRzDdlbrQ2F8rLj5tUsNkcCt 907KZ5Z5bhaEFXi8H3uBh5NgKiQN47BGJ/ELtqBI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hannes Reinecke , Christoph Hellwig , Sasha Levin Subject: [PATCH 4.19 36/85] nvme-multipath: zero out ANA log buffer Date: Mon, 18 Feb 2019 14:43:02 +0100 Message-Id: <20190218133503.756303601@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133459.758004711@linuxfoundation.org> References: <20190218133459.758004711@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c7055fd15ff46d92eb0dd1c16a4fe010d58224c8 ] When nvme_init_identify() fails the ANA log buffer is deallocated but _not_ set to NULL. This can cause double free oops when this controller is deleted without ever being reconnected. Signed-off-by: Hannes Reinecke Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/multipath.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index c27af277e14e..815509dbed84 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -556,6 +556,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) return 0; out_free_ana_log_buf: kfree(ctrl->ana_log_buf); + ctrl->ana_log_buf = NULL; out: return error; } @@ -563,5 +564,6 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) void nvme_mpath_uninit(struct nvme_ctrl *ctrl) { kfree(ctrl->ana_log_buf); + ctrl->ana_log_buf = NULL; } -- 2.19.1