Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3025692ybt; Mon, 29 Jun 2020 13:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz4D1hWnfXFkvFtmQiCUa7SQO8SynMRrRkUvEOmJBILVLT+73ZIBKucZCI+86f54iWz6UP X-Received: by 2002:aa7:d2c9:: with SMTP id k9mr11476633edr.98.1593461653122; Mon, 29 Jun 2020 13:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461653; cv=none; d=google.com; s=arc-20160816; b=QarqPVHiYICezk7C9kgGKh5v2cPhpJJLk3p53tFwKBVy+DPACQJzwQE8tOhW/SauiF I3CS9Lwk7GezsNGA8SEO3CX4OGKmAbUAa39mZGzW7+l1U3V8ejUVwWF5du9XPWSDORCc YjO06HphAonxTM+D+N09hHhSBHtLQJhB06HTV+TKJpLUau1vml6d9ArVoth6GSdUwZ0M mfS5yu+JEDJu/7ZZLyJlf0wTVwBqNrtMRp4lGm7F9d8yYtfvgNcgXU/mph5/ZpspRClj 7UIkN/bUG1noj3MDHbnMD1MTtdUTdvt67fYpWUrYNQdnKzN/ROWvp8pW/brVPxbRfawz +GUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kAwvAQQ5MlXk0DBpS7/BfAqF8DG1rqiJ2LHpL1ZOcUo=; b=NbNtnGYGuqo/+KONVAZ/XDfB6HhYmV15+vcXk0mHQWMb+Cx7tpy0b6vTml9O3rpPvP 4q8hgPmxSHZC9zVOWCOknRmRH36Lj3znFoEr6vuij/ShWVABo1E1s2hzAMcXVDnFCo0L GZ4C5VLE4FZC+MegCcuh2mVreRSKdhcp7av8SpSiqT0RUhEZM/DMmWbMmRB47sunH8Jl BewH039G/mnk/56KuqGbd6uRAaLdyJJges0JG2ByTsSWLJdlqsAjKFK82dhsGnW0PUix rq+X3O7aQrxeCn7C7Bx/uwrmBqJPcZXNFP2qd4XmwG2eJ0mpn0iBF37Uj1u+E054XOL2 heGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RUGmo2Sa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si389621ejc.595.2020.06.29.13.13.46; Mon, 29 Jun 2020 13:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RUGmo2Sa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730570AbgF2UM3 (ORCPT + 99 others); Mon, 29 Jun 2020 16:12:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:40572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732880AbgF2TaU (ORCPT ); Mon, 29 Jun 2020 15:30:20 -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 6B5D2252D7; Mon, 29 Jun 2020 15:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445103; bh=nULSmqGEhmQIT2xXjTf3HDKmeDaPmfs7XfWtTTe2MXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RUGmo2SaTQLvaLNUNHtdI/o0BMyGliBHdZCb0/8apwuh5nTPTYt3XF4OnA/Lh483c +TADVpkBDGw7UXReQp9Fkd4gRlEnJiO2zO735+unBoWKcO7Cj294SK9+5rArhqLK9E 9nWyPqvhllOtrMMFNvfPi1zFirok2HqQH4tr6f+0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 4.14 12/78] rocker: fix incorrect error handling in dma_rings_init Date: Mon, 29 Jun 2020 11:37:00 -0400 Message-Id: <20200629153806.2494953-13-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153806.2494953-1-sashal@kernel.org> References: <20200629153806.2494953-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.186-rc1 X-KernelTest-Deadline: 2020-07-01T15:38+00:00 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: Greg Kroah-Hartman --- 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