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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6A71C54FB9 for ; Wed, 15 Nov 2023 20:02:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344196AbjKOUCF (ORCPT ); Wed, 15 Nov 2023 15:02:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344206AbjKOUCE (ORCPT ); Wed, 15 Nov 2023 15:02:04 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11165189 for ; Wed, 15 Nov 2023 12:02:01 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83E4DC433C7; Wed, 15 Nov 2023 20:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700078520; bh=FkCUWr8lS6i/cC10gN/v0rWWHGPqujPXQQhuqYntE0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K9AqhBXhECYJlpYLGcKGbVV++YP+hSwnQGQkEASS+/VPOBUDIcmz+c0/V1l/g9bi7 2F79z0CyQ39GWu+sNnVpGR+aevcoY1TmlP/LJfuXoG9aylBYK9fWCQ7t1GrVFUjzk3 te9gGLYT8NjWRBWjUFzitg3C0tsUR693ubT2SMSM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Helge Deller , Sasha Levin Subject: [PATCH 6.1 372/379] fbdev: imsttfb: Fix error path of imsttfb_probe() Date: Wed, 15 Nov 2023 14:27:27 -0500 Message-ID: <20231115192707.166889109@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115192645.143643130@linuxfoundation.org> References: <20231115192645.143643130@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Helge Deller [ Upstream commit 518ecb6a209f6ff678aeadf9f2bf870c0982ca85 ] Release ressources when init_imstt() returns failure. Signed-off-by: Helge Deller Stable-dep-of: aba6ab57a910 ("fbdev: imsttfb: fix a resource leak in probe") Signed-off-by: Sasha Levin --- drivers/video/fbdev/imsttfb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index e6adb2890ecfe..004e7da9e70ba 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1531,8 +1531,10 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto error; info->pseudo_palette = par->palette; ret = init_imstt(info); - if (!ret) - pci_set_drvdata(pdev, info); + if (ret) + goto error; + + pci_set_drvdata(pdev, info); return ret; error: -- 2.42.0