Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp28984pxb; Thu, 20 Jan 2022 08:27:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxw+8MlPo4MwyE8lwJsY2PTK5Hya6Rih4bAtg1o1CQZHvVn6Cp4G6UBZ9DhyUZgiWiIF0U5 X-Received: by 2002:aa7:8bcf:0:b0:4c0:10fd:9075 with SMTP id s15-20020aa78bcf000000b004c010fd9075mr36581184pfd.15.1642696025797; Thu, 20 Jan 2022 08:27:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642696025; cv=none; d=google.com; s=arc-20160816; b=H65PoDTzLW/guY0Np5G+sxbzmhu3rq3uarp3nMGLjzS3WP5OYiXmOnMIBDBvQ+cVu+ wRRw8P06VugP57sM0Iffy6+Y2hfun44iaHkMgRbqz7oEQKFpF+i8488Bsij+fEsZgcJC x0fMhoKuO2HpP4U4+w+2jNSi0kV+M6kf4xw2j8PJroT3yx1nqNGoyNgvcPhyhF8acXLH M6WU664apAc5rXJq7hBER7fB4r9IJiX6B7OwvE+NE8sQIGoDckfRo7TOfE5rDQuQrpOw Bi9iK+TRAp48tbJJVcVCH48irBRG0judO3GlRhBSTU3a5ZY5Ioe4CjC9tAj+pbM8Yyh8 j18g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZGpTPX3yrwMhUl3+3fT600ltmkLsVSmyWnCvbYraPqs=; b=K37bfC4JHh5iJvG9XHg7M+3P1XVlA3ka3Mgh3dSz6UpwR1PHJjT1NdG8yZ/YiaICex XwSF/8PrDF1HSS2lb69fJz6bOhzc/nBcDLhasyOeENCv4QwPQSLjlbzKj3u9WTJ1Onum cCI7tlCVC41lYdtMniHq+XANE3OTVS9e64iH7EI+5j2Qv0w3lC2/SHQo/SQKNGY8Olc9 2W65em7oopqDV6C4a/6ZS2PhafgGYiGXYdSQHQK4edKvh6sEpg7icpyQXqL1HF4FS3vS DHkSMq9fUEnqibfkB1FOjf+62dJZb9/ZnHh9UbzfdicVTyUmJObt6PcdRsaPrBOElNLx 3/zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UtUfidkS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j3si3352386pfr.288.2022.01.20.08.26.25; Thu, 20 Jan 2022 08:27:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UtUfidkS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346977AbiARQLm (ORCPT + 99 others); Tue, 18 Jan 2022 11:11:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346958AbiARQKA (ORCPT ); Tue, 18 Jan 2022 11:10:00 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2D65C061751; Tue, 18 Jan 2022 08:09:59 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 94CC8612DB; Tue, 18 Jan 2022 16:09:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D41BC00446; Tue, 18 Jan 2022 16:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1642522199; bh=r8FlrmrI35vVyw0pyT1BmGPRhUYFl0eRGJhsRoVy3tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UtUfidkSvc2cUzfxjmcPADpfleJt9mA3ycsE04REMSaZdmzrgDzjuaECo7EehmtE3 OtXdSaUVz8CY0Np0akprvdaYZL6lh8bEx8NDSHt3SlRdLhm2YdojmjNrGsQEY9LdPY 13QGdolBLBd1ZgZM0MlcUMwE+nvo24LMexPaGlGw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kris Karas , Javier Martinez Canillas , Maxime Ripard Subject: [PATCH 5.15 13/28] video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Date: Tue, 18 Jan 2022 17:05:59 +0100 Message-Id: <20220118160452.320685489@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118160451.879092022@linuxfoundation.org> References: <20220118160451.879092022@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Javier Martinez Canillas commit 0499f419b76f94ede08304aad5851144813ac55c upstream. The vga16fb framebuffer driver only supports Enhanced Graphics Adapter (EGA) and Video Graphics Array (VGA) 16 color graphic cards. But it doesn't check if the adapter is one of those or if a VGA16 mode is used. This means that the driver will be probed even if a VESA BIOS Extensions (VBE) or Graphics Output Protocol (GOP) interface is used. This issue has been present for a long time but it was only exposed by commit d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") since the platform device registration to match the {vesa,efi}fb drivers is done later as a consequence of that change. All non-x86 architectures though treat orig_video_isVGA as a boolean so only do the supported video mode check for x86 and not for other arches. Link: https://bugzilla.kernel.org/show_bug.cgi?id=215001 Fixes: d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") Reported-by: Kris Karas Cc: # 5.15.x Signed-off-by: Javier Martinez Canillas Tested-by: Kris Karas Acked-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20220110095625.278836-3-javierm@redhat.com Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/vga16fb.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) --- a/drivers/video/fbdev/vga16fb.c +++ b/drivers/video/fbdev/vga16fb.c @@ -184,6 +184,25 @@ static inline void setindex(int index) vga_io_w(VGA_GFX_I, index); } +/* Check if the video mode is supported by the driver */ +static inline int check_mode_supported(void) +{ + /* non-x86 architectures treat orig_video_isVGA as a boolean flag */ +#if defined(CONFIG_X86) + /* only EGA and VGA in 16 color graphic mode are supported */ + if (screen_info.orig_video_isVGA != VIDEO_TYPE_EGAC && + screen_info.orig_video_isVGA != VIDEO_TYPE_VGAC) + return -ENODEV; + + if (screen_info.orig_video_mode != 0x0D && /* 320x200/4 (EGA) */ + screen_info.orig_video_mode != 0x0E && /* 640x200/4 (EGA) */ + screen_info.orig_video_mode != 0x10 && /* 640x350/4 (EGA) */ + screen_info.orig_video_mode != 0x12) /* 640x480/4 (VGA) */ + return -ENODEV; +#endif + return 0; +} + static void vga16fb_pan_var(struct fb_info *info, struct fb_var_screeninfo *var) { @@ -1422,6 +1441,11 @@ static int __init vga16fb_init(void) vga16fb_setup(option); #endif + + ret = check_mode_supported(); + if (ret) + return ret; + ret = platform_driver_register(&vga16fb_driver); if (!ret) {