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,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 17BB0C4332F for ; Sun, 8 Sep 2019 12:46:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6BDC2081B for ; Sun, 8 Sep 2019 12:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946811; bh=/uiRU/bRlf4Gi2FYLXPOHSkfVnfBB7FegScuSc57xQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ySewBiqljLsEhZBtQT4Vo+MEV3C2JnxNFRqbpzshULFTEkgWx9Qy+xlhgmi+ldW0v wGVp93N7ITvvUG7rxUgpzFxerEP6mVs3BGPHmkVDXVEoI9phkq54XlPhamz/Z5ux36 4rbOKuLDiryBD7LnG2EIebGTzRV93FNmVWnd0A/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730497AbfIHMqu (ORCPT ); Sun, 8 Sep 2019 08:46:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730473AbfIHMqq (ORCPT ); Sun, 8 Sep 2019 08:46:46 -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 38AD220644; Sun, 8 Sep 2019 12:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946805; bh=/uiRU/bRlf4Gi2FYLXPOHSkfVnfBB7FegScuSc57xQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/waX/RK2C7qqiOnFQ9zdjztm/dlhqHRms4NENo1mWTT9PaLnE/Z2uqiQB+GU96vb h4JXdyJaCgg4qy0Gd6Q7DqodSNtyY8irl6bbQRoG8mYxu0GlFS3wroDS02cTOBHKXE d1cxAmFINhygxCdTgs8swGPh1i7ojpM14adpIZ/Y= 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.14 11/40] liquidio: add cleanup in octeon_setup_iq() Date: Sun, 8 Sep 2019 13:41:44 +0100 Message-Id: <20190908121119.994516726@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121114.260662089@linuxfoundation.org> References: <20190908121114.260662089@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 1e0fbce86d608..55e8731264634 100644 --- a/drivers/net/ethernet/cavium/liquidio/request_manager.c +++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c @@ -232,8 +232,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