From patchwork Sun Jan 29 15:17:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 50003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1784434wrn; Sun, 29 Jan 2023 07:27:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXthgawOtFxZJRr8NNCJG6qFnT4B+pHq9ozdbwnLHV0cDaRWh1yYb4P8A3Xmutyrlo2fVJCB X-Received: by 2002:a05:6a20:d80e:b0:b8:71b7:b903 with SMTP id iv14-20020a056a20d80e00b000b871b7b903mr46272165pzb.31.1675006025494; Sun, 29 Jan 2023 07:27:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675006025; cv=none; d=google.com; s=arc-20160816; b=NPRIvzP/kJJcdBelITdZDmbq2M2xa7ji0LZNBtAf+wraI+WzlejViOIq+tEpCS/kYb x+UrFuMp9OwVHLbAqmKYwvRN9e1rKCcMP4mlgDHKTjUXLIc5FJLZ/bzcpEGqrBZp3pPg k6jf+THqG6/+tLkfkGgQmbPxed4aB0MS6U6dKTQp3rkSa0lLET3M7+OzYxI1wnbUVsZ+ Xq/N4+682f9uEj2cGoV7jYAY+1sSgpSIOMYGNbsCY1gu9xZ6M+VvPmCbcDP0QEDvxmrQ zz0Z51uHLQo8nhcRdQnUIB9s3U0ZVvbJCAoOSmgaS6LIMse0gkP7tKivCernknjhZqpD 4ESw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :mail-followup-to:message-id:subject:cc:to:from:date; bh=hKBownmIoRxO0KN+rwvHeu8YmgBGnXNQu3o3yuFVNLg=; b=aLazQkNrRtIBy7qQ6o3fljlwq743bKFfVULtT4siQdePr4rn72BYQwEJQuAR5h/5VY Zf0J4bHKbE9mfWMWMwyXP/ufB8x32HUJo0Nfd0eZnha9gGSeKdKnVwXb1nR8oyftZVXv 4wdgemLL4+nrjsbKm1ECSXlbCpsiOXhGxM9jUyIuQHeRSHfDg2MNztGMbmVueA0SZeyp vtnk0ufEqavSG8DUWudr7DE5XG5atTQbblEsephRUdltm/xZ833aLpaZx7DNh/N1grcl D3yxt+Aw97rOC2Sx+Z1QSMQdR5j47Awr/XNfj7nIkxHY5rOg2A2zF8JJUOPOkrawpubL g4FA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e188-20020a6369c5000000b004b64146f245si9613920pgc.148.2023.01.29.07.26.53; Sun, 29 Jan 2023 07:27:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235084AbjA2PRp (ORCPT + 99 others); Sun, 29 Jan 2023 10:17:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234670AbjA2PRo (ORCPT ); Sun, 29 Jan 2023 10:17:44 -0500 Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBF5D1F484; Sun, 29 Jan 2023 07:17:42 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 9241720101; Sun, 29 Jan 2023 16:17:41 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vuEAmnVOOigS; Sun, 29 Jan 2023 16:17:41 +0100 (CET) Received: from begin (lfbn-bor-1-1163-184.w92-158.abo.wanadoo.fr [92.158.138.184]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 69BB6200F3; Sun, 29 Jan 2023 16:17:41 +0100 (CET) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pM9R7-00GylW-03; Sun, 29 Jan 2023 16:17:41 +0100 Date: Sun, 29 Jan 2023 16:17:40 +0100 From: Samuel Thibault To: gregkh@linuxfoundation.org, Daniel Vetter , Helge Deller Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Sanan Hasanov Subject: [PATCHv2] fbcon: Check font dimension limits Message-ID: <20230129151740.x5p7jj2pbuilpzzt@begin> Mail-Followup-To: Samuel Thibault , gregkh@linuxfoundation.org, Daniel Vetter , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Sanan Hasanov MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756046067825542679?= X-GMAIL-MSGID: =?utf-8?q?1756371118147601043?= blit_x and blit_y are u32, so fbcon currently cannot support fonts larger than 32x32. The 32x32 case also needs shifting an unsigned int, to properly set bit 31, otherwise we get "UBSAN: shift-out-of-bounds in fbcon_set_font", as reported on: http://lore.kernel.org/all/IA1PR07MB98308653E259A6F2CE94A4AFABCE9@IA1PR07MB9830.namprd07.prod.outlook.com Kernel Branch: 6.2.0-rc5-next-20230124 Kernel config: https://drive.google.com/file/d/1F-LszDAizEEH0ZX0HcSR06v5q8FPl2Uv/view?usp=sharing Reproducer: https://drive.google.com/file/d/1mP1jcLBY7vWCNM60OMf-ogw-urQRjNrm/view?usp=sharing Reported-by: Sanan Hasanov Signed-off-by: Samuel Thibault Fixes: 2d2699d98492 ("fbcon: font setting should check limitation of driver") Cc: stable@vger.kernel.org Tested-by: Miko Larsson Reviewed-by: Greg Kroah-Hartman --- v1 -> v2: - Use BIT macro instead of fixing bit test by hand. - Add Fixes and Cc: stable headers. Index: linux-6.0/drivers/video/fbdev/core/fbcon.c =================================================================== --- linux-6.0.orig/drivers/video/fbdev/core/fbcon.c +++ linux-6.0/drivers/video/fbdev/core/fbcon.c @@ -2489,9 +2489,12 @@ static int fbcon_set_font(struct vc_data h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres)) return -EINVAL; + if (font->width > 32 || font->height > 32) + return -EINVAL; + /* Make sure drawing engine can handle the font */ - if (!(info->pixmap.blit_x & (1 << (font->width - 1))) || - !(info->pixmap.blit_y & (1 << (font->height - 1)))) + if (!(info->pixmap.blit_x & BIT(font->width - 1)) || + !(info->pixmap.blit_y & BIT(font->height - 1))) return -EINVAL; /* Make sure driver can handle the font length */