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 6676FC43217 for ; Wed, 30 Mar 2022 12:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344580AbiC3MTZ (ORCPT ); Wed, 30 Mar 2022 08:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344044AbiC3Lzj (ORCPT ); Wed, 30 Mar 2022 07:55:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13002BB01; Wed, 30 Mar 2022 04:53:43 -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 9C92FB81C36; Wed, 30 Mar 2022 11:53:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70321C340F3; Wed, 30 Mar 2022 11:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641221; bh=XGwqFT0oW95ciFt+vOb6lf4/eOqu5hiiwyCdGxGNLCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbMDkwxWpENbbjPPsplCVW0F428GWZMIKA0Ou8NRgit4yGxZJmSRW2RYWzO8yZmPu ahKtX3ArVIQLtmwxzC06CLmDGneCdCMPgkPbcLsSzouATYNuAlynSy5AyWnlq7rTq0 te16nU2Zvm9DTy1Fs/T770cTuNZVo+Lk1wZZb4Kk9kA+3D6XqaYjsBlueB5HT8D9Tm R04r87o4p31os4DrHJWNzflo5nHUqGJr+zB+ViDWq9WmxT18QrKT1Pu1ETQwvX0Tly /Rcln6iJ7KqtgK3ENaM41OFNFKe1PkOsxMhJXwkSggcaH63UfZKKJOF9ekhDSI3O0S jjt/mIyuy3xdQ== 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.14 02/20] video: fbdev: w100fb: Reset global state Date: Wed, 30 Mar 2022 07:53:18 -0400 Message-Id: <20220330115336.1672930-2-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115336.1672930-1-sashal@kernel.org> References: <20220330115336.1672930-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-kernel@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 ffda1d68fb05..566eacd903a3 100644 --- a/drivers/video/fbdev/w100fb.c +++ b/drivers/video/fbdev/w100fb.c @@ -772,12 +772,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; @@ -802,8 +808,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