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 0DEC8C4167E for ; Wed, 30 Mar 2022 11:54:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344367AbiC3Lzv (ORCPT ); Wed, 30 Mar 2022 07:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345945AbiC3LzP (ORCPT ); Wed, 30 Mar 2022 07:55:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F0B213CE3; Wed, 30 Mar 2022 04:53:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3A357B81C35; Wed, 30 Mar 2022 11:53:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F02DC3410F; Wed, 30 Mar 2022 11:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641188; bh=05cThSb22/+lIGkr5ns+nVLnLvru2HHP6djIf1hnw0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bArdrmO96qR7pPvyLUfSre+NZ1tW3SIn+j5SUpCC7+SnpEwZOMvI+WMDABBAZFDC5 AXXbBxaXehYvhPlBFwFq2q35V1vmXRpEPqVWdAV7c5ztCKPQWNdu0Bkkk1sqQsZVm9 yMsDCo8rxNWGDkT8wmdR+0DAFhUTDaekQuklW+BjmjD7yxFTfVcDzzenUlcyFzf9mu 9ljm7CCBCE5dRayv3/dcDDa1zWR76oR7JI5Sr1n65Hek1QCjAOGuxIl/zT6ikwKJrI R3X+QD/p2fTXXXFJcPSWVJdngLdkQLdbGIVFbt7JV84gZKj0XX7GYpYqJBsy2BVZ03 UE0SeqvWKjF2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Evgeny Novikov , Kirill Shilimanov , Helge Deller , Sasha Levin , tomi.valkeinen@ti.com, linux-fbdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 02/22] video: fbdev: w100fb: Reset global state Date: Wed, 30 Mar 2022 07:52:43 -0400 Message-Id: <20220330115303.1672616-2-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115303.1672616-1-sashal@kernel.org> References: <20220330115303.1672616-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org From: Evgeny Novikov [ Upstream commit 8738ddcac644964ae128ccd3d80d48773c8d528e ] w100fb_probe() did not reset the global state to its initial state. This can result in invocation of iounmap() even when there was not the appropriate successful call of ioremap(). For instance, this may be the case if first probe fails after two successful ioremap() while second probe fails when first ioremap() fails. The similar issue is with w100fb_remove(). The patch fixes both bugs. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov Co-developed-by: Kirill Shilimanov Signed-off-by: Kirill Shilimanov Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/w100fb.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/w100fb.c b/drivers/video/fbdev/w100fb.c index 967030176d87..307066113c35 100644 --- a/drivers/video/fbdev/w100fb.c +++ b/drivers/video/fbdev/w100fb.c @@ -773,12 +773,18 @@ int w100fb_probe(struct platform_device *pdev) fb_dealloc_cmap(&info->cmap); kfree(info->pseudo_palette); } - if (remapped_fbuf != NULL) + if (remapped_fbuf != NULL) { iounmap(remapped_fbuf); - if (remapped_regs != NULL) + remapped_fbuf = NULL; + } + if (remapped_regs != NULL) { iounmap(remapped_regs); - if (remapped_base != NULL) + remapped_regs = NULL; + } + if (remapped_base != NULL) { iounmap(remapped_base); + remapped_base = NULL; + } if (info) framebuffer_release(info); return err; @@ -803,8 +809,11 @@ static int w100fb_remove(struct platform_device *pdev) fb_dealloc_cmap(&info->cmap); iounmap(remapped_base); + remapped_base = NULL; iounmap(remapped_regs); + remapped_regs = NULL; iounmap(remapped_fbuf); + remapped_fbuf = NULL; framebuffer_release(info); -- 2.34.1