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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 27792C433EF for ; Sun, 8 Sep 2019 12:47:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F040F21924 for ; Sun, 8 Sep 2019 12:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946876; bh=/Tc/KeZM2tcLgkwQkolR8y+hBSI4+tI3PX06LjjUKII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U6OoXtRX0StJ9GtOAEN/yT8K3cvSW1oHGjbP0gAoeh6Kk9RRBFANSyCMGQDSx4aXB 6HCWqy7Y1l2sKJ/kfUX3CYV1TqkFKUzUtCi+xul2ljB+OUT1QuIZkYnSd+m2EdqYRk HZdvgLvEH4nkmIZy2xdj83xpWPM1A5Koi43GYcW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730816AbfIHMrx (ORCPT ); Sun, 8 Sep 2019 08:47:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:36302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728551AbfIHMrn (ORCPT ); Sun, 8 Sep 2019 08:47:43 -0400 Received: from localhost (unknown [62.28.240.114]) (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 89BD52196F; Sun, 8 Sep 2019 12:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946863; bh=/Tc/KeZM2tcLgkwQkolR8y+hBSI4+tI3PX06LjjUKII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c9W5U5vVY2FjEaww2KaAJqflhr1k9qs7w9j2svSf/mEBPO3drurKmJAweCPVJQGF7 +2mfGyyglpgUVSF2+f9slTrQXZGdm4tXHvm7pTthAc6QUC5MEpCLrJCGZCAspJCQEm PV0bSG+DSlPTjCXxSDHbGPa19eD2YaRij9l3ryU8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 28/57] liquidio: add cleanup in octeon_setup_iq() Date: Sun, 8 Sep 2019 13:41:52 +0100 Message-Id: <20190908121136.504767578@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121125.608195329@linuxfoundation.org> References: <20190908121125.608195329@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 [ Upstream commit 6f967f8b1be7001b31c46429f2ee7d275af2190f ] If oct->fn_list.enable_io_queues() fails, no cleanup is executed, leading to memory/resource leaks. To fix this issue, invoke octeon_delete_instr_queue() before returning from the function. Signed-off-by: Wenwen Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/liquidio/request_manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c index 8f746e1348d4c..3deb3c07681fd 100644 --- a/drivers/net/ethernet/cavium/liquidio/request_manager.c +++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c @@ -238,8 +238,10 @@ int octeon_setup_iq(struct octeon_device *oct, } oct->num_iqs++; - if (oct->fn_list.enable_io_queues(oct)) + if (oct->fn_list.enable_io_queues(oct)) { + octeon_delete_instr_queue(oct, iq_no); return 1; + } return 0; } -- 2.20.1