From patchwork Fri Oct 27 12:04:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 740244 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 22828C25B6E for ; Fri, 27 Oct 2023 12:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345539AbjJ0MFG (ORCPT ); Fri, 27 Oct 2023 08:05:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345686AbjJ0MFF (ORCPT ); Fri, 27 Oct 2023 08:05:05 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00BE6129 for ; Fri, 27 Oct 2023 05:05:01 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-507a3b8b113so2902682e87.0 for ; Fri, 27 Oct 2023 05:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698408300; x=1699013100; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=hPBeFfhGzz7b9reukuJd9y/UBu4JJXA38Z99vzaShGU=; b=JOY80YAg4jZ4FB10dGRGRO3FasoX8v92N+oOIAZY4uma/rpNpXSeu+4g3Hn5jlrRYj 0sFgFyy087nelp1+K5lcECy7rw7Lt5WsJXBy2CiExPVnKDUzfy0EG9ySmdm3SmKD6c+C H5mahBnvatmSC5jnC28P9JjQ6abUAalx5TTcSKI0jlUcGKIiRkLlQ96OMc508xcdlKLb 7WvTuLPIhVAmyhQtRqeSaXjEKQAGnPmPCdR/x7Bdpr27sL3q21pfi5oPn57nr8jL01ob HobjcKTKJ/Uw+Rnk+vCcHTBHNYoGgUFSGV/gkrEDTeUgyEhjfvF993jXvoXq+pvpT0Ug Xkcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698408300; x=1699013100; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hPBeFfhGzz7b9reukuJd9y/UBu4JJXA38Z99vzaShGU=; b=jZK1ukPV+++VFh7dp7naAN8888q9A3Zn2ODkV3hSBrblJ3/hTswJ94B5cuUMLdKJwk GWfQa85N55dsPWWHW8K+0NqzAxVvRRQGWSW4HMtXeYahTyae0lB/sV4aSl5zw0oO7MjB lwEZexjJ+pgMEq7ELblVi2Ts14rWxZZfk059g0v5mR+9OuWK/Mn476umLVzk1t5H2GYL Ih0ZhMp04iFC37x888D77p6bT/HXqs9ZJvtDJOhXZYXhGV+Hsvza4Vwu1GcmfzBP8NSd uzT9L0obQ5f43fpA10Qlx+XZg5wJGj8sAdVctEsLvoC9RxGFGpXHso2BK6G20UNbkvi1 elBA== X-Gm-Message-State: AOJu0YxtYfP0mVdC6SasJRyycirNX4Jtr3H309M7XnNSC1XzGgqi9exk 8Uxp8L0Gh+lZcA16MBDeFPeSzg== X-Google-Smtp-Source: AGHT+IE2TD3mcdg9qAax1VoYDY/yTuv41aG+a5xNuJLSiW9RCK7h0wL0oxjupUYN1A9aWv+pqg0YQQ== X-Received: by 2002:a05:6512:2807:b0:502:d35b:5058 with SMTP id cf7-20020a056512280700b00502d35b5058mr2101718lfb.4.1698408300149; Fri, 27 Oct 2023 05:05:00 -0700 (PDT) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id u18-20020a05600c19d200b00401b242e2e6sm4962968wmq.47.2023.10.27.05.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 05:04:59 -0700 (PDT) Date: Fri, 27 Oct 2023 15:04:56 +0300 From: Dan Carpenter To: Helge Deller Cc: Thomas Zimmermann , Javier Martinez Canillas , Sam Ravnborg , Zheng Wang , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org Subject: [PATCH 1/2] fbdev/imsttfb: fix double free in probe() Message-ID: <014c0272-0d53-4625-8517-e8b4aa68f4dd@moroto.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The init_imstt() function calls framebuffer_release() on error and then the probe() function calls it again. It should only be done in probe. Fixes: 518ecb6a209f ("fbdev: imsttfb: Fix error path of imsttfb_probe()") Signed-off-by: Dan Carpenter --- drivers/video/fbdev/imsttfb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index e7e03e920729..acb943f85700 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1421,7 +1421,6 @@ static int init_imstt(struct fb_info *info) if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >> 3) > info->fix.smem_len || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) { printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel); - framebuffer_release(info); return -ENODEV; } @@ -1453,14 +1452,11 @@ static int init_imstt(struct fb_info *info) FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_YPAN; - if (fb_alloc_cmap(&info->cmap, 0, 0)) { - framebuffer_release(info); + if (fb_alloc_cmap(&info->cmap, 0, 0)) return -ENODEV; - } if (register_framebuffer(info) < 0) { fb_dealloc_cmap(&info->cmap); - framebuffer_release(info); return -ENODEV; } From patchwork Fri Oct 27 12:05:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 738804 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 172E7C25B6E for ; Fri, 27 Oct 2023 12:05:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345802AbjJ0MFw (ORCPT ); Fri, 27 Oct 2023 08:05:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345801AbjJ0MFw (ORCPT ); Fri, 27 Oct 2023 08:05:52 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A5251BE for ; Fri, 27 Oct 2023 05:05:49 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507e85ebf50so2726674e87.1 for ; Fri, 27 Oct 2023 05:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698408347; x=1699013147; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:message-id:subject:cc :to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Rtys4OVP5ZzVlnIPSorJGpGjoOL2VcdIqIpp51DIOc0=; b=k4SQRzmRV9BFUXc5DNokM8iEZaCj/aOpkp1U/ZSVnN98XzWL6JqXXHO+db86NBfrHk dI9/Oylp2mWjdz8oHBPEo4NtbyEn++eAcJE5m1X1a+CIC3dKOk0GYKScJXMyWnixofjJ XRaFR++f1r9/oyH7UHEQJ8HK2vYzAAB9y+8XaBeXr76lygsORRwUgirwwn/sEz5gvgJn WX7N3X19gsa6fUfeVhfYYd+OnyG4gTsqtJ3o2uHaIP/UzrAyupkX3FbrHYfkj5jI28PK ZOPnn9ddeWEReaSpYwunNucDjBL6TSj/LeNKr9+RLg7Bu+Qd2zUA0ULiHp5LAbaeOykg N0RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698408347; x=1699013147; h=in-reply-to:content-disposition:mime-version:message-id:subject:cc :to:from:date:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Rtys4OVP5ZzVlnIPSorJGpGjoOL2VcdIqIpp51DIOc0=; b=A5ecTFKjGTuyPwqI2sNs+Ar5Cmu+i7UJZgqxBaeU+iOkmnXi2AHxZuCpd6rp+EHe5b fkgfVHUFz1UDTRuIOXEHcEBehoYtuJK6kQOZjHABdcUfaZbpjluiXPDUnOf/y8nlxyhY jh4Tze3P/1AgWYgUArYgomG2vN32jzU4fFy6cVLpQKOM1KUptraUVjxHDXLGC4Yaku3r zJPudcVBMCzbQUYdABJvlLaUfd6/CbV+dh9y386DJ930o3WxHbpbepV4r/hCcI7EihtD XqtU54a8Hxh1gV9r72WSo4Rh62dvYZyNAaks7upIzUiHcTwttzAZ2GcDoFK2vje4do+4 iL6A== X-Gm-Message-State: AOJu0Yzn+7I8KKS6WCQ7GXjaj62r17fcLg6ijW4Fat/FfHKUhv2WIYh+ QmMb6iOuRm5rzms5lnXZW9N2+Q== X-Google-Smtp-Source: AGHT+IEwMLdMiT1DpGl66JFRaW3Jkd9s7CFvWo0aNUOb8/tWmvL7FTmnMQJ10tzgk46/kJ10FHVi5Q== X-Received: by 2002:a05:6512:48d1:b0:500:bf33:3add with SMTP id er17-20020a05651248d100b00500bf333addmr1543741lfb.47.1698408347447; Fri, 27 Oct 2023 05:05:47 -0700 (PDT) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id t20-20020a0560001a5400b0032ddc3b88e9sm1663138wry.0.2023.10.27.05.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 05:05:47 -0700 (PDT) Date: Fri, 27 Oct 2023 15:05:44 +0300 From: Dan Carpenter To: Zheng Wang Cc: Helge Deller , Thomas Zimmermann , Javier Martinez Canillas , Sam Ravnborg , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/2] fbdev/imsttfb: fix a resource leak in probe Message-ID: <71f55328-2275-4e53-98f2-f8a88cbd3399@moroto.mountain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <014c0272-0d53-4625-8517-e8b4aa68f4dd@moroto.mountain> X-Mailer: git-send-email haha only kidding Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org I've re-written the error handling but the bug is that if init_imstt() fails we need to call iounmap(par->cmap_regs). Fixes: c75f5a550610 ("fbdev: imsttfb: Fix use after free bug in imsttfb_probe") Signed-off-by: Dan Carpenter --- drivers/video/fbdev/imsttfb.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index acb943f85700..660499260f46 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1496,8 +1496,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (!request_mem_region(addr, size, "imsttfb")) { printk(KERN_ERR "imsttfb: Can't reserve memory region\n"); - framebuffer_release(info); - return -ENODEV; + ret = -ENODEV; + goto release_info; } switch (pdev->device) { @@ -1514,36 +1514,39 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) printk(KERN_INFO "imsttfb: Device 0x%x unknown, " "contact maintainer.\n", pdev->device); ret = -ENODEV; - goto error; + goto release_mem_region; } info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap(addr, par->ramdac == IBM ? 0x400000 : 0x800000); if (!info->screen_base) - goto error; + goto release_mem_region; info->fix.mmio_start = addr + 0x800000; par->dc_regs = ioremap(addr + 0x800000, 0x1000); if (!par->dc_regs) - goto error; + goto unmap_screen_base; par->cmap_regs_phys = addr + 0x840000; par->cmap_regs = (__u8 *)ioremap(addr + 0x840000, 0x1000); if (!par->cmap_regs) - goto error; + goto unmap_dc_regs; info->pseudo_palette = par->palette; ret = init_imstt(info); if (ret) - goto error; + goto unmap_cmap_regs; pci_set_drvdata(pdev, info); - return ret; + return 0; -error: - if (par->dc_regs) - iounmap(par->dc_regs); - if (info->screen_base) - iounmap(info->screen_base); +unmap_cmap_regs: + iounmap(par->cmap_regs); +unmap_dc_regs: + iounmap(par->dc_regs); +unmap_screen_base: + iounmap(info->screen_base); +release_mem_region: release_mem_region(addr, size); +release_info: framebuffer_release(info); return ret; }