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 690E4C433DF for ; Tue, 23 Jun 2020 17:37:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AD2F20706 for ; Tue, 23 Jun 2020 17:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592933872; bh=qvqP4soC5gZ2anWBJAEP+JMKWxsurLUH0d5vSfNG5GY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TiYe7j7G4cTeN3bb3EAaERZXLHpxu+9cFmiV88rgS4R+jl7V5Y1qb7+en4WlXFtJO 4iVnXb8x3aYIEJyj9VQ+kydnKU0QAtIjsskc7Tfw/rI0+DZbMQ90aJgJwN0k1UCO0n bkJnl/61lEoVFe6BexYth5Ybfl75QZGcWXZPRDpk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387817AbgFWRhu (ORCPT ); Tue, 23 Jun 2020 13:37:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387719AbgFWRhC (ORCPT ); Tue, 23 Jun 2020 13:37:02 -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 D0AD6207D0; Tue, 23 Jun 2020 17:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592933822; bh=qvqP4soC5gZ2anWBJAEP+JMKWxsurLUH0d5vSfNG5GY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O92kSKOGj0dG1DsRuLzo2lyig1+S1vIbMEWQQzYGxtqbLE/c5Q1g28K3GYJYkeEdu VvIBgUmNzbPAYbO4wFv8MDnaYt86Ti/seT873wd08tPoIxY95ZMhWpbzBtWTw61SNQ /33Vdk5jO468G2bx/PqaEmx/YF/nkNsbZZnY1dgU= 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.9 3/6] rocker: fix incorrect error handling in dma_rings_init Date: Tue, 23 Jun 2020 13:36:55 -0400 Message-Id: <20200623173658.1356241-3-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200623173658.1356241-1-sashal@kernel.org> References: <20200623173658.1356241-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: 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 24b746406bc7a..4640e6c4aecf3 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -648,10 +648,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