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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9061C433E4 for ; Mon, 17 Aug 2020 15:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC8F3233CF for ; Mon, 17 Aug 2020 15:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677816; bh=xVNJuHkAildX0xCTS4AHRtF9UgkFpucBy56ZAeDRSXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Rk9kvD3hz+7pIdNGmkBv9wcOLDUFmI8OOSR5gw9YdvXPXQeu4M/MpgwiiTGo72aj9 UOoULjAFQbDcg0G1/k9HNnE4gtVMUTdV9ON4q/IczKDGDV53BLYNdcP7i1uX7W2Hv2 vlwUD2RxZuKeB4rC3ZdZOppmch66ANacYsipmBDU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729309AbgHQPXd (ORCPT ); Mon, 17 Aug 2020 11:23:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:50922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729546AbgHQPX3 (ORCPT ); Mon, 17 Aug 2020 11:23:29 -0400 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 B680A22B49; Mon, 17 Aug 2020 15:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677809; bh=xVNJuHkAildX0xCTS4AHRtF9UgkFpucBy56ZAeDRSXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Ss6BqiOG45/kZ+RK6eIGtqpT8VzVDcut9ObzSEkLxRwMjci5wfnCtLN/Xi9PPPn3 sej2Rrc+/YsFcfe5Cs1a28EgeFQqM9QCEX35yYnxmAQtKzaBX0nYw+Br2CwZXpUQ9Z td6rNogd2njs/ql2I3xMRxh4CCaAACdffOSh+SVw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evgeny Novikov , Antonino Daplas , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 5.8 088/464] video: fbdev: savage: fix memory leak on error handling path in probe Date: Mon, 17 Aug 2020 17:10:41 +0200 Message-Id: <20200817143838.003929210@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Evgeny Novikov [ Upstream commit e8d35898a78e34fc854ed9680bc3f9caedab08cd ] savagefb_probe() calls savage_init_fb_info() that can successfully allocate memory for info->pixmap.addr but then fail when fb_alloc_cmap() fails. savagefb_probe() goes to label failed_init and does not free allocated memory. It is not valid to go to label failed_mmio since savage_init_fb_info() can fail during memory allocation as well. So, the patch free allocated memory on the error handling path in savage_init_fb_info() itself. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov Cc: Antonino Daplas Signed-off-by: Bartlomiej Zolnierkiewicz Link: https://patchwork.freedesktop.org/patch/msgid/20200619162136.9010-1-novikov@ispras.ru Signed-off-by: Sasha Levin --- drivers/video/fbdev/savage/savagefb_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c index 3c8ae87f0ea7d..3fd87aeb6c798 100644 --- a/drivers/video/fbdev/savage/savagefb_driver.c +++ b/drivers/video/fbdev/savage/savagefb_driver.c @@ -2157,6 +2157,8 @@ static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev, info->flags |= FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_IMAGEBLIT; + else + kfree(info->pixmap.addr); } #endif return err; -- 2.25.1