From patchwork Sun Jun 26 08:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 12895652 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 5CE98CCA482 for ; Sun, 26 Jun 2022 08:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230221AbiFZI4Y (ORCPT ); Sun, 26 Jun 2022 04:56:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231126AbiFZI4X (ORCPT ); Sun, 26 Jun 2022 04:56:23 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 205AE11A26 for ; Sun, 26 Jun 2022 01:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1656233776; bh=GVwAU6WKhe8S6vd1VeXMuut4rnt9i8o8SJSS9oquiaE=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=R6XKwTyRQHkJ86rmkkLu23u16LWOhcM1V70X8i73d0B8i9c11P2JyrSmOdLaOJgMD e6b42ZUs60PUSeqBqbC+PMQ88mrp97HFOpNP2n+MMRc79efr66+ziTU89ecegqmUoi Z3civmqaz03TG6Tvj82vdZQEdy0LmhxAJUdwMFbw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from p100.fritz.box ([92.116.135.166]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MNKhs-1oGyfC2SKY-00Op9Y; Sun, 26 Jun 2022 10:56:16 +0200 From: Helge Deller To: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch, linux-fbdev@vger.kernel.org Subject: [PATCH v5 3/4] fbcon: Prevent that screen size is smaller than font size Date: Sun, 26 Jun 2022 10:56:14 +0200 Message-Id: <20220626085615.53728-4-deller@gmx.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220626085615.53728-1-deller@gmx.de> References: <20220626085615.53728-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:SuX2yOZiuPtU7JYAiTcg364dh4uVVWqPPo9OE9S4tlAiXJ/YREK s6c+snpSuu2mXq1Kp1emoiCBUJSjQjZp2h1O82PPRuM/9aDEwz/aX7ZDptD9ENlGUWB9tra 2NmMMluVVX6hUCi7sgejZC9oM1z5iotRc7hMg350olnjPpiEKrS7Hjswq2/aLM76p5Fm9kw HTWsz3xEBkMX7vrzZitPA== X-UI-Out-Filterresults: notjunk:1;V03:K0:MeSoyM6YPHk=:oWeY/G4fZCoo6TWyvw8YGl J2RMq0gOsbVkPf5pSsouduhNy1WpxZCDRrKgk4Maunc0O88/u88oCN72gpJmruYOEbItGnH3g Vm6bAvB98ZQ12evQWFCA4da1pLErA7e5m6NqHoyYXpd/wpLyZU4yaox2i7hf23JpzBewmaWpY sh0S0hfTcp7XpvA67YSqPC50/IYgprm0hGEtQ4lCu7GfVZM4omDzcMPvTbVrUeQwl1T4VOdb+ 4/qY8z8W88xyDaPKGgvuFIg8VRwnUSPe8W6Xs6iPEPS1Yy4y5odLBVmnCFHrL51OEd0lOqUza y3d0ejCpNU/LBn0XaNhwPOJBCleErjj2fs8m8GQy2V2+p8SKXqk9aRWvgLZHN/9Acc6YpkR7U cUutiuSk9Iy7PzTOU1vT2jr4dDxAOh0Am7F8czYVYMIPNuPwHI4xZsiLR8Tawc2sPhhwoxlWn +DnzKJyYnwZHLxMs1oQdCgqWCeag+IpL3es36PsvEx0D1jp0cvt/IMjbeGdY+REuKBhr7K2et R7gJuwkuwb6rwkOn1/rcCTlo5nNmidKhZ23S9lkd/h7eyT9psGKGbBCS/heNgcjRYSwg7HqNz INiOCyGevt2mY2C0jkZniQNXAsU+mlo/8eq95cZSm/a5FX+v3qrm8SDQWB1bjiYVtC/62P/hu fnVMSzIwGRn0VxVP3f40VzlYxIxWfexEfhiiugTcAs0EKzqxMuFF7pmeWLnAzoEeVtbba0V6c IyORGRgo6FC5rj9wJSSW6sdFIyoP4ey0MzmT3vG3GVjVSAkpmRo0AgBa9dpogj56O5jX3eRxF Rh8cE+yWqjGRhr2kSWYVIvuwbyX+LdAjTVN+a7ukDL/TDr5zkT/Vs8KAAB3uEFjYClvL4H+gT AFja8gSILvzl1SsuJWK/MB4zb2G+lOYRtU/1XVSouoyftLkAMMqjL+hWiX8/Ldk0ebTXWC9uS kVN08NFcDy6iWxvo/BVJ6Athyiw1HEodCSw8tKxGQ/gJyszkKnW8uubXJiAakuPS9S8b1R4T0 ZIuRcpRH72WafsjhJIwnsizdnSn8SQd/Vi6n7UlZaZWiqCZ5PorIu7gWf5Mc3lbojM68y5NiK YhFvR0TnzltUTvP39eBWLd1TWTPxqvw/B8e1vT5tkdDtEha74lKnNoqkQ== Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org We need to prevent that users configure a screen size which is smaller than the currently selected font size. Otherwise rendering chars on the screen will access memory outside the graphics memory region. This patch adds a new function fbcon_modechange_possible() which implements this check and which later may be extended with other checks if necessary. The new function is called from the FBIOPUT_VSCREENINFO ioctl handler in fbmem.c, which will return -EINVAL if userspace asked for a too small screen size. Signed-off-by: Helge Deller Cc: stable@vger.kernel.org # v5.4+ Reviewed-by: Daniel Vetter --- drivers/video/fbdev/core/fbcon.c | 27 +++++++++++++++++++++++++++ drivers/video/fbdev/core/fbmem.c | 4 +++- include/linux/fbcon.h | 4 ++++ 3 files changed, 34 insertions(+), 1 deletion(-) -- 2.35.3 diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index e162d5e753e5..69c7261ac334 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2736,6 +2736,33 @@ void fbcon_update_vcs(struct fb_info *info, bool all) } EXPORT_SYMBOL(fbcon_update_vcs); +/* let fbcon check if it supports a new screen resolution */ +int fbcon_modechange_possible(struct fb_info *info, struct fb_var_screeninfo *var) +{ + struct fbcon_ops *ops = info->fbcon_par; + struct vc_data *vc; + int i; + + WARN_CONSOLE_UNLOCKED(); + + if (!ops || ops->currcon < 0) + return -EINVAL; + + /* prevent setting a screen size which is smaller than font size */ + for (i = first_fb_vc; i <= last_fb_vc; i++) { + vc = vc_cons[i].d; + if (!vc || registered_fb[con2fb_map[i]] != info) + continue; + + if (vc->vc_font.width > FBCON_SWAP(var->rotate, var->xres, var->yres) || + vc->vc_font.height > FBCON_SWAP(var->rotate, var->yres, var->xres)) + return -EINVAL; + } + + return 0; +} +EXPORT_SYMBOL(fbcon_modechange_possible); + int fbcon_mode_deleted(struct fb_info *info, struct fb_videomode *mode) { diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 5dfa4bbee642..b6e1d0f2b974 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1112,7 +1112,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, return -EFAULT; console_lock(); lock_fb_info(info); - ret = fb_set_var(info, &var); + ret = fbcon_modechange_possible(info, &var); + if (!ret) + ret = fb_set_var(info, &var); if (!ret) fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL); unlock_fb_info(info); diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h index ff5596dd30f8..2382dec6d6ab 100644 --- a/include/linux/fbcon.h +++ b/include/linux/fbcon.h @@ -15,6 +15,8 @@ void fbcon_new_modelist(struct fb_info *info); void fbcon_get_requirement(struct fb_info *info, struct fb_blit_caps *caps); void fbcon_fb_blanked(struct fb_info *info, int blank); +int fbcon_modechange_possible(struct fb_info *info, + struct fb_var_screeninfo *var); void fbcon_update_vcs(struct fb_info *info, bool all); void fbcon_remap_all(struct fb_info *info); int fbcon_set_con2fb_map_ioctl(void __user *argp); @@ -33,6 +35,8 @@ static inline void fbcon_new_modelist(struct fb_info *info) {} static inline void fbcon_get_requirement(struct fb_info *info, struct fb_blit_caps *caps) {} static inline void fbcon_fb_blanked(struct fb_info *info, int blank) {} +static inline int fbcon_modechange_possible(struct fb_info *info, + struct fb_var_screeninfo *var) { return 0; } static inline void fbcon_update_vcs(struct fb_info *info, bool all) {} static inline void fbcon_remap_all(struct fb_info *info) {} static inline int fbcon_set_con2fb_map_ioctl(void __user *argp) { return 0; }