Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8266149ybl; Thu, 16 Jan 2020 13:33:49 -0800 (PST) X-Google-Smtp-Source: APXvYqwPU2VzFb5Aoj4BMagcqxtNR94TcI3JibwcST+sIVW8lHLVIVT/94vvNAlVyvZOTt50IahY X-Received: by 2002:a05:6830:4d9:: with SMTP id s25mr3751929otd.171.1579210429593; Thu, 16 Jan 2020 13:33:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579210429; cv=none; d=google.com; s=arc-20160816; b=eWhzi8L1o2lPDdsUXqYAvLn2Chm6DdujNyj7WPjWNOw1nfhRZeXnT2wDOtKT83hWoB XWIqGF5RLxtHFZfAIf4h4W9gOT+7f/X5DcCMKFIurKK3w44PO+FLEFp31Td8KcpJG/UW aMLrPBSTQs0/3Y8a/O+hB4UpZPasR3bldtpMk3YqKP6QvohdJgyr8LPh6upvpngJKY6T BndpH4U7JEbm97d2ZdQw41Xt4X20JBWwmtGmSVuxSQ8F1+huO9AuQziTmoDQw9kE8Qmf t5jvf9wjiFvmobjfCPk63uq8HJ4dPAJhKJ1q6D795V8sPPtiPPwacaFLAXR3YHLFzYYp AzPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TkH7rh+1csPDKx//RS0OahUE1U+sJM88jLBCK/X6aoY=; b=CKrY1nJipzF8ObdB1mVHG5lZpRmh9FLD8/OjHpAlfbpuY/oEQ7gVRZz6CvZ3ewakBj D5Dk2JgMPl8cl4LVAVg9Y4meoiu9kkIx956azeHyWN9CPDevechx79E5BO3ZdNsk5+q4 QhDVe/0k6n6f5edl6uypgy6HMZCUzVP8/mj/CQCSfxUkcuCaISeH6RDLWYEz+NdYlov0 T2KdTMU2mgUVxjNHkzlwStutEopG8rYnusm70oH+ChtQLe4nAyr3yCaczOR3f+fRXmvR To5pQzuWV/tN9aMyuWBOsv+OrVfreCigAm2CkCR67roClnBsOb8EUU7ZccZePaAxrvzM 5/VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pIpZVIff; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n11si13139298otq.112.2020.01.16.13.33.37; Thu, 16 Jan 2020 13:33:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pIpZVIff; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730518AbgAPRjI (ORCPT + 99 others); Thu, 16 Jan 2020 12:39:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:54252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404985AbgAPRiY (ORCPT ); Thu, 16 Jan 2020 12:38:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F1AD246DB; Thu, 16 Jan 2020 17:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196303; bh=YD5Ie152X2diOgl1WgLPBjDtz/7t+yfr5MhUnXiuwZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pIpZVIffxzr+AGE8//7n3EkxavUHWj18OwhyVKbvt7/ZXEfv5L+EMJVr2Qg5oVOeK svGIsrV5dej/xnKAgK0q342mKo6KrubruFpJWhU6KwLoSSzLWRTi07FDgqCBD6sT70 mNIgv6HFJ0vjKnXdsuJh0ZOMS1aUrwYWYCOZ0b38= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bart Van Assche , Himanshu Madhani , Giridhar Malavali , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 113/251] scsi: qla2xxx: Unregister chrdev if module initialization fails Date: Thu, 16 Jan 2020 12:34:22 -0500 Message-Id: <20200116173641.22137-73-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bart Van Assche [ Upstream commit c794d24ec9eb6658909955772e70f34bef5b5b91 ] If module initialization fails after the character device has been registered, unregister the character device. Additionally, avoid duplicating error path code. Cc: Himanshu Madhani Cc: Giridhar Malavali Fixes: 6a03b4cd78f3 ("[SCSI] qla2xxx: Add char device to increase driver use count") # v2.6.35. Signed-off-by: Bart Van Assche Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_os.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3bae56b202f8..e730aabc26d0 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6055,8 +6055,7 @@ qla2x00_module_init(void) /* Initialize target kmem_cache and mem_pools */ ret = qlt_init(); if (ret < 0) { - kmem_cache_destroy(srb_cachep); - return ret; + goto destroy_cache; } else if (ret > 0) { /* * If initiator mode is explictly disabled by qlt_init(), @@ -6075,11 +6074,10 @@ qla2x00_module_init(void) qla2xxx_transport_template = fc_attach_transport(&qla2xxx_transport_functions); if (!qla2xxx_transport_template) { - kmem_cache_destroy(srb_cachep); ql_log(ql_log_fatal, NULL, 0x0002, "fc_attach_transport failed...Failing load!.\n"); - qlt_exit(); - return -ENODEV; + ret = -ENODEV; + goto qlt_exit; } apidev_major = register_chrdev(0, QLA2XXX_APIDEV, &apidev_fops); @@ -6091,27 +6089,37 @@ qla2x00_module_init(void) qla2xxx_transport_vport_template = fc_attach_transport(&qla2xxx_transport_vport_functions); if (!qla2xxx_transport_vport_template) { - kmem_cache_destroy(srb_cachep); - qlt_exit(); - fc_release_transport(qla2xxx_transport_template); ql_log(ql_log_fatal, NULL, 0x0004, "fc_attach_transport vport failed...Failing load!.\n"); - return -ENODEV; + ret = -ENODEV; + goto unreg_chrdev; } ql_log(ql_log_info, NULL, 0x0005, "QLogic Fibre Channel HBA Driver: %s.\n", qla2x00_version_str); ret = pci_register_driver(&qla2xxx_pci_driver); if (ret) { - kmem_cache_destroy(srb_cachep); - qlt_exit(); - fc_release_transport(qla2xxx_transport_template); - fc_release_transport(qla2xxx_transport_vport_template); ql_log(ql_log_fatal, NULL, 0x0006, "pci_register_driver failed...ret=%d Failing load!.\n", ret); + goto release_vport_transport; } return ret; + +release_vport_transport: + fc_release_transport(qla2xxx_transport_vport_template); + +unreg_chrdev: + if (apidev_major >= 0) + unregister_chrdev(apidev_major, QLA2XXX_APIDEV); + fc_release_transport(qla2xxx_transport_template); + +qlt_exit: + qlt_exit(); + +destroy_cache: + kmem_cache_destroy(srb_cachep); + return ret; } /** -- 2.20.1