From patchwork Sun Dec 3 18:13:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhipeng Lu X-Patchwork-Id: 172969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2354744vqy; Sun, 3 Dec 2023 10:14:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGt5wrmqqNIAdFxzQBgUAU7y0XEqh7q3l8QA/FbUAuNQ8Y8HUV3yN1Ns/3vBIX4j7OWCDZy X-Received: by 2002:a05:6a20:a1a2:b0:14c:a2e1:65ec with SMTP id r34-20020a056a20a1a200b0014ca2e165ecmr2964983pzk.38.1701627256001; Sun, 03 Dec 2023 10:14:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701627255; cv=none; d=google.com; s=arc-20160816; b=tElTGbeMo0ba1WeE8TFoDgaYIH+UZrPCP5XUBaqgC8e0Mbu0qRov5pv+ZQxeseImHm kpYaKemxvK4kZQefJ+PYZahMvlMK2ZP7et1dCYtytp1y6YPJj3xMULly9axrI+x9WfXK ZmhB4kV9hQzGqsFIGizra7zcS79I7b2Fr/mfRI5n6+x17cb03pON9PZ4bFJ5lb7cFpAi LUnRzhSrtoWtNkTFaaEhFMqwpv80B5NWEpyJSbqa8ytTvzlNAsOWtYKU5dad0wSE95Ve nLofzBCF/KaWiMfXEC78zMPuwSwSM2hCbAy7itLSBXcjKBvEaYOj3YakzQ6tyBJoU2QK FaLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=zQhaFLdKeQVxS8Io8Pfm2g97ti/AeB/Via8RLiB/PK8=; fh=iQy9zm6pzIexHx6N4tDgsicf/iR2rqM8znjVZ1Q+dE8=; b=lUJPPY5ioB29fplD7m3sVeROb3EMNcK350Zhuyps5DamNbfOMl5OEZJE+udlF8/aMb Dh6r0PjW5IBVtYhvy5eWpPBKZ2Gy0rhYE9DvHjYSKZsYw2D2yHhyD07xxVlQsZ2o7dN3 /AGjGFLpkHrMvMWCvcNgdZKQTdjvRKA6OpCE13mndHl7Co0BDADgOAPj6L93PbmYo1gQ ZTYI/2wWCwUbCAgrwlrfWlQO/pTWE3RFI0Ugx9dNDmBOo+aj63n3YB0yH7D0WlcbZXEv OV1RzMtu7y3K0XJdeJQjaJwV+CDuKT2HJrKzGZHVfmz4f733aFAI08h8iZbXXILWVs7M d5vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u12-20020a056a00158c00b006cbee55fe7csi6789879pfk.379.2023.12.03.10.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 10:14:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C54978069D95; Sun, 3 Dec 2023 10:14:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233820AbjLCSOE (ORCPT + 99 others); Sun, 3 Dec 2023 13:14:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjLCSOD (ORCPT ); Sun, 3 Dec 2023 13:14:03 -0500 Received: from zg8tmtyylji0my4xnjqumte4.icoremail.net (zg8tmtyylji0my4xnjqumte4.icoremail.net [162.243.164.118]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5467FE7; Sun, 3 Dec 2023 10:14:07 -0800 (PST) Received: from luzhipeng.223.5.5.5 (unknown [60.186.191.128]) by mail-app4 (Coremail) with SMTP id cS_KCgCHjTVnxWxlastEAA--.50948S2; Mon, 04 Dec 2023 02:14:00 +0800 (CST) From: Zhipeng Lu To: alexious@zju.edu.cn Cc: Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Giridhar Malavali , Himanshu Madhani , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: qla2xxx: fix a memleak in qla2x00_mem_alloc Date: Mon, 4 Dec 2023 02:13:42 +0800 Message-Id: <20231203181342.3289136-1-alexious@zju.edu.cn> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: cS_KCgCHjTVnxWxlastEAA--.50948S2 X-Coremail-Antispam: 1UD129KBjvdXoWrZF1kCry5XF1xGrW7Jr1DWrg_yoWkWrg_ua 1UXFyxuw1qgr4xJw18JrySy39Fv3Wqqr1vkFsYqry3JrW5uw18Wr15XayrZa1fXw4ayFZ8 uw47XrW5ZryUtjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzxFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j 6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Cr 1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAK I48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7 xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xII jxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw2 0EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x02 67AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbXdbUUUUUU== X-CM-SenderInfo: qrsrjiarszq6lmxovvfxof0/ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 03 Dec 2023 10:14:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784285501893998295 X-GMAIL-MSGID: 1784285501893998295 When the dsd allocated in the for loop by kzalloc fails, it should gc all the resources allocated before, instead of just return a -ENOMEM. According to the error-handling behavior of ha->dif_bundl_pool, the dsd's failure should free every resources after fail_dif_bundl_dma_pool, together with ha->dif_bundl_pool itself. So the error-handling should goes to label fail_dma_pool. Fixes: 50b812755e97 ("scsi: qla2xxx: Fix DMA error when the DIF sg buffer crosses 4GB boundary") Signed-off-by: Zhipeng Lu --- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 50db08265c51..bdd66f9e8850 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4252,7 +4252,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, ql_dbg_pci(ql_dbg_init, ha->pdev, 0xe0ee, "%s: failed alloc dsd\n", __func__); - return -ENOMEM; + goto fail_dma_pool; } ha->dif_bundle_kallocs++;