Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3076174ybt; Mon, 29 Jun 2020 14:41:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwfAfjXnLHuItozlwF2yCwVVM78F7DR+s1Na4yQx+OjqiRKkBbWGnQBNBPU2tyUF2G5g4l X-Received: by 2002:a17:906:2681:: with SMTP id t1mr14377094ejc.350.1593466898363; Mon, 29 Jun 2020 14:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593466898; cv=none; d=google.com; s=arc-20160816; b=JQCAsQVLHgGhnqk04gZ9WJCIg51C4NA9yszEDi6Yb9/CnJ+gppJukRvX/7AnXfVQV1 UUrTDm+V6z6UoVPDjZLkOUX/DKi+C8qA0V2nXtdSiaWfoEI6zWgUxOEhsbV8iZ7VfVaR B9fyGKt5abppUwOIShCjru9y28pq1Gsc1h6S3G1hyqS1TJNwhmL7DsbfSvb7aC7uiFvY O+ljscjlnfJ1zN7EfUKW8t59242g9EoiVUErE3ZDs3zi8maTTb6XE22oxo7JSoD/JZeW yIchnJ4NsA9xPzDiMu4ejdXJCSv7bQ6ki0UyUxHvJnkUvwYJGjVa2e3xzYcF8MdTlsHw 5Hug== 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=WraKcbShD7xDlUQqJFIjf9Vb4OB9+ymg95g3l6zyI9M=; b=Wpuxn+mj9LOcO0yoJ1OFrmuOOytURQAZsJQ3IKq8pjFjylOROEWNaNI+nkTWRgpZvQ YZUs+2OHB6w3OpTVAOPLWbEiZT3W1vPK4tXzDAvpicHK6+PNYjqVSZq7IYvjxgq2BkNZ oL+kwcDUbjhK5DVQGygHKt4c3hMJqbpKodY6yP6RdqQZBIlewktBR+O/97rsDELOoHnw FCic1ctqK+L2p4hdrDOcDiXBGnQMFf0InBpuwyJgqtWNcn/QUySy9m+htlKX0DaNPc2G aezlkgjn2h/+xdThnjbOjq5CZiqtx6zJLX9ApxkqvbyFvDgEgMfFdee1WpGoAHBa6Gsu LU/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XirVlwBS; 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 b10si560663edj.94.2020.06.29.14.41.15; Mon, 29 Jun 2020 14:41:38 -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=XirVlwBS; 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 S2391318AbgF2Vkr (ORCPT + 99 others); Mon, 29 Jun 2020 17:40:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:60646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728190AbgF2SkW (ORCPT ); Mon, 29 Jun 2020 14:40:22 -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 18F292404C; Mon, 29 Jun 2020 15:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443918; bh=4HcPOWPJZGNE3U8X8zCydG6eyp7N0fJNEm8i+L7BItA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XirVlwBSXF38aH1snAjaSmtZ+fF+/y0mOk6yHp4ue2nr3Hcc3Ppidk5pDEpJ1vPXn t4O5NGlRzIErNDxAGWPMeDRztvULrciVR9fnAsg7JGm9lvTFowAPLDkgbXiK4uiB4x 5ZkR3Ca2uELAgg3XC66IqnPCLvdTokDRZWLVsCzQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 5.7 019/265] rocker: fix incorrect error handling in dma_rings_init Date: Mon, 29 Jun 2020 11:14:12 -0400 Message-Id: <20200629151818.2493727-20-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+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 7585cd2270ba4..fc99e7118e494 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -647,10 +647,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