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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 15FFBC433E1 for ; Tue, 23 Jun 2020 17:38:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E158B20706 for ; Tue, 23 Jun 2020 17:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592933892; bh=KWZ4vxdIlZlF0Ypgk1IzbYLUdkCT7F1AdepT9O0oI/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c/qxgbCMWXwGZRHtnZnYeXTBz6xiBanVMgrW0B7C1iOdm7Hxob/ugOzTwDEL49Yy3 WTexYuvzhHHvzlyKDS1UNACDLS7juH8404KoRM+GtmPGoZ9s5cujW7Nx2nIul2lBMj 13w55osXNWlM9aB9fRRBmjH3RRPak9awSfJJTc3A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733254AbgFWRiL (ORCPT ); Tue, 23 Jun 2020 13:38:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:34460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387681AbgFWRgy (ORCPT ); Tue, 23 Jun 2020 13:36:54 -0400 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 4A39020774; Tue, 23 Jun 2020 17:36:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592933814; bh=KWZ4vxdIlZlF0Ypgk1IzbYLUdkCT7F1AdepT9O0oI/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nPBkpyBfqCUQzFwOffR/gWEXzKy5VJKOy39SSaqF8id9l79x+eMz/hu54VGUgTOkN dn1PYZYGn3PP7ATyq+G3gSeB6KOtKVva4DukgGq2ka985dx2KmdOpczJJSXyr8ZX5y jq0T91P/W2XxMgtVH7coBdxAXbqww4EwrnsQD5i8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 3/6] rocker: fix incorrect error handling in dma_rings_init Date: Tue, 23 Jun 2020 13:36:46 -0400 Message-Id: <20200623173649.1356142-3-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200623173649.1356142-1-sashal@kernel.org> References: <20200623173649.1356142-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aditya Pakki [ Upstream commit 58d0c864e1a759a15c9df78f50ea5a5c32b3989e ] In rocker_dma_rings_init, the goto blocks in case of errors caused by the functions rocker_dma_cmd_ring_waits_alloc() and rocker_dma_ring_create() are incorrect. The patch fixes the order consistent with cleanup in rocker_dma_rings_fini(). Signed-off-by: Aditya Pakki Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/rocker/rocker_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 056cb60936303..8ad05e5008299 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -651,10 +651,10 @@ static int rocker_dma_rings_init(struct rocker *rocker) err_dma_event_ring_bufs_alloc: rocker_dma_ring_destroy(rocker, &rocker->event_ring); err_dma_event_ring_create: + rocker_dma_cmd_ring_waits_free(rocker); +err_dma_cmd_ring_waits_alloc: rocker_dma_ring_bufs_free(rocker, &rocker->cmd_ring, PCI_DMA_BIDIRECTIONAL); -err_dma_cmd_ring_waits_alloc: - rocker_dma_cmd_ring_waits_free(rocker); err_dma_cmd_ring_bufs_alloc: rocker_dma_ring_destroy(rocker, &rocker->cmd_ring); return err; -- 2.25.1