Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp369876pxx; Wed, 28 Oct 2020 06:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPH/1X4GOoC4dovgH/9MppfKIFShWZd56ozQTjU3MIseVxHcThkMz0jO9+bdCqC2CZ8GtJ X-Received: by 2002:aa7:dac4:: with SMTP id x4mr7687253eds.165.1603893310948; Wed, 28 Oct 2020 06:55:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603893310; cv=none; d=google.com; s=arc-20160816; b=Ww3fluOvs2BCXrlkqwGK586xxAmXC8VzSb8awv1mRM5494yEfaZExafPdf4Yjp6zIG 8AIC6TjCIp+AS/1gTSPm0MJ9jqS9dEGxZH8efViliZgnSM2piSAB+AR8X5ZJtr3HsMTe 2wURz/1O/ZukRy59mklN0FpA6ktEA5bStIfJ8HtaMk0jwKcZ9A7trkWXPKOTHNlwh4UZ 4IG2/1iRnKDkxqz1BG68DKCXqEARXhJbNG7G6I+f0pLTn1tYXVb4rnH+06o9Hk2epqmD 0AD51JmJ43fE/gN5JdD/akDNYqq8MbbXsiXWEJw9M78Q1aAP6TvjDJbRZqEgVlyVHRrm cM0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W6tykXYrHLe5S75Tn4c1X4qyH61rWGl/YfrMGVKb8Nc=; b=I8PoVDc+4674SKl1tkGJ0EZDs8A3wo2uhxIx4Uyfph3Jrx4yJ/kQCEv+cJ3Kqbr0fP qUysV3oZFT9Da0tORkw1kqx2Fik8KvXkmChVDl/YDhG8QksmTJvT6Lub4VhCVM55/tTt g1RpEnOwhnJyFc1cynzrH08v7kcpSyJmrOiNqfxdrCCP+HHCsHm1dB7D6NdRaGHpZ1jT 0ovZTImH+D/18psRWhEZ8QcV3LW4viAvHacRHRHmxMRHWbZBEyLO+4K590RPmsAgZILX xIMEFKbhqPn//6wYqtJCzz/LBag4p5C3sstlCLQJQgIBczPx7MJaIAcGb1myrIcKR0WM fzPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JsUMFFFF; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gf17si2900638ejb.226.2020.10.28.06.54.47; Wed, 28 Oct 2020 06:55:10 -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=JsUMFFFF; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1803458AbgJ0Pwz (ORCPT + 99 others); Tue, 27 Oct 2020 11:52:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:45402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1798596AbgJ0P3K (ORCPT ); Tue, 27 Oct 2020 11:29:10 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 B404020728; Tue, 27 Oct 2020 15:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812549; bh=cKsQjm/Jxc4p0wWw/RoMqSrFVokuN7UcbLlS2G+kzJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JsUMFFFF9d4aml0pnRLLLpdZOmKj5OoXiBvQYMo8peQTFR47xJcK2t2DLzIYKPhf7 yYohFcF7l8QvGJlwa/zgilDUTVZ8+ptGWcoIff3Tw5ID2LrJKE/kWu3vSKf03tTyFX 1CYYe1aGaXkhfrmCGrDtXpClREGQBssF25dw3Vvs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Mathieu Malaterre , Kangjie Lu , Benjamin Herrenschmidt , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 5.9 241/757] video: fbdev: radeon: Fix memleak in radeonfb_pci_register Date: Tue, 27 Oct 2020 14:48:11 +0100 Message-Id: <20201027135501.891842750@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit fe6c6a4af2be8c15bac77f7ea160f947c04840d1 ] When radeon_kick_out_firmware_fb() fails, info should be freed just like the subsequent error paths. Fixes: 069ee21a82344 ("fbdev: Fix loading of module radeonfb on PowerMac") Signed-off-by: Dinghao Liu Reviewed-by: Mathieu Malaterre Cc: Kangjie Lu Cc: Benjamin Herrenschmidt Signed-off-by: Bartlomiej Zolnierkiewicz Link: https://patchwork.freedesktop.org/patch/msgid/20200825062900.11210-1-dinghao.liu@zju.edu.cn Signed-off-by: Sasha Levin --- drivers/video/fbdev/aty/radeon_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 3fe509cb9b874..13bd2bd5c043a 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2307,7 +2307,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, ret = radeon_kick_out_firmware_fb(pdev); if (ret) - return ret; + goto err_release_fb; /* request the mem regions */ ret = pci_request_region(pdev, 0, "radeonfb framebuffer"); -- 2.25.1