From patchwork Wed Nov 27 20:28:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 11264921 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DFBF112B for ; Wed, 27 Nov 2019 21:30:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D36720870 for ; Wed, 27 Nov 2019 21:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890200; bh=sJJLiwpOvgcSG95me1xpezoQaHq1vBEc0vPQTntpyhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A7zVgjvYVtNmNGsHbL13xMaVuvjU4R8Lx3GKoMCNaSyDM0dweEr3tUZKmn9Z3f4Fi 3MX421Jjb18SzwsCe+/Nd2ASydDAvM/8V3N6QFCOgOWTPe1yODhxgT9apYAl7usspq OQ+d+j9EoaAg43++D8uLo+w2/NmVFgCEYhIp7y3A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730487AbfK0U41 (ORCPT ); Wed, 27 Nov 2019 15:56:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:47266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731049AbfK0U40 (ORCPT ); Wed, 27 Nov 2019 15:56:26 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 149102084D; Wed, 27 Nov 2019 20:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888185; bh=sJJLiwpOvgcSG95me1xpezoQaHq1vBEc0vPQTntpyhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHTudNyMPGeKm/lvJ6ktBklyc7N7JMBefFta3cBH/AnkBR77ZuYaNqTAw2OnWDZks ZChbePjSbXOwMzvNRqgcPIXN3SrSQSJy5thVDQaTW47diSesfxo6g+GudHqKgWlosY GkoZbuWZpW58BuhigZ4OHYoBHhpS0nD2KZd4cvn4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Borislav Petkov , David Daney , Jan Glauber , Mauro Carvalho Chehab , Sergey Temerkhanov , linux-edac , Sasha Levin Subject: [PATCH 4.19 036/306] EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr() Date: Wed, 27 Nov 2019 21:28:06 +0100 Message-Id: <20191127203117.470390146@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Dan Carpenter [ Upstream commit d8c27ba86a2fd806d3957e5a9b30e66dfca2a61d ] Fix memory leak in L2c threaded interrupt handler. [ bp: Rewrite commit message. ] Fixes: 41003396f932 ("EDAC, thunderx: Add Cavium ThunderX EDAC driver") Signed-off-by: Dan Carpenter Signed-off-by: Borislav Petkov CC: David Daney CC: Jan Glauber CC: Mauro Carvalho Chehab CC: Sergey Temerkhanov CC: linux-edac Link: http://lkml.kernel.org/r/20181013102843.GG16086@mwanda Signed-off-by: Sasha Levin --- drivers/edac/thunderx_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index c009d94f40c52..34be60fe68922 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -1884,7 +1884,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id) default: dev_err(&l2c->pdev->dev, "Unsupported device: %04x\n", l2c->pdev->device); - return IRQ_NONE; + goto err_free; } while (CIRC_CNT(l2c->ring_head, l2c->ring_tail, @@ -1906,7 +1906,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id) l2c->ring_tail++; } - return IRQ_HANDLED; + ret = IRQ_HANDLED; err_free: kfree(other);