From patchwork Fri Aug 5 10:09:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1664014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=AcK8+AFU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LzhF00lc9z9s1l for ; Fri, 5 Aug 2022 20:10:44 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oJuHo-0000qU-RQ; Fri, 05 Aug 2022 10:10:32 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oJuHj-0000dS-Ll for kernel-team@lists.ubuntu.com; Fri, 05 Aug 2022 10:10:27 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id DC6443F132 for ; Fri, 5 Aug 2022 10:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1659694226; bh=vMghZ6vguaMeucTKz3aZJ8QLujQG3VP1lk5JXEo8ohU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AcK8+AFUK2YZO6xBqR0AeXimNps/wkuCbZ+mOz5x/q+YllxHohJhImaGxAc9+kopI Fdm+/tjikEUc4QBhgdx/DhzgnS6Dk5RrqSvf/Gtt/J87AbCPwGHA2YWgN5eY07cPX8 3jZ/gZf9xX4EPGQXtrQczkHgHCvo3AyxSPLkbBp3MGQsckXNMajNq5vEfc2BMV+Igg dHlAhQdx36FC7FIDi64Q9LA5rGsGavgswI90To8XA8Xge9z681zC2emH0YV/3rrfkD Vz+ab0pq8tWVuufwNEHqWPlXF+lJSYVprMnlh5jGPwO8QywrWx7F3Tr97eG/b3SCR9 ecLNkUc6uWWpg== Received: by mail-wm1-f72.google.com with SMTP id bh18-20020a05600c3d1200b003a32044cc9fso1094537wmb.6 for ; Fri, 05 Aug 2022 03:10:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=vMghZ6vguaMeucTKz3aZJ8QLujQG3VP1lk5JXEo8ohU=; b=AYzbIMessUoT8JYupfdmbaMuzPuoVLHzshcMWHvyJ92+mdAg39ieKWa68hEKXhL3DI L/EKDF4tx3qmlDOpYHfU1h2WIzkjfqeB7TuQZ3wkE8chX+8yKKz+DrYNWP3WB9gfRid2 kFdyR6MJX4lnIPM2LnqRkaVnXmKesq8LsIRzfyRTupqQWtRLiJKh66wM+Oy/WQhZv/qP /+8FdOkRLnHqLWrMdrRxtjuGhybKlyiQzebBp9LW4jEkK4s2Hd5pDREhY5DLmQ+z0k30 ncfd9x1Qa7s4oVQqR/R2ACUWdN789SDD88+B2RFH7nY2Jd4jXAj/ftkuAP9xKpKhtPl+ QN4w== X-Gm-Message-State: ACgBeo1zjUQim20BHKApSB8Ge74csHP2xttOuvWzupvREYINGv19xS/A rIYwrOU7ktUjfUczonY+XDtEwbc6/xBbspbyNpF8xBl8HyHizcxynY2Ihd8u9JDhiJODXBndyqN TtCdoA6WvY/nJSLB8Z903zx1bHCJxz5yG/ChwHxkj1Q== X-Received: by 2002:adf:d1c2:0:b0:220:762f:fc64 with SMTP id b2-20020adfd1c2000000b00220762ffc64mr3941002wrd.253.1659694226375; Fri, 05 Aug 2022 03:10:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Lal5RHBqqluIenqAk9h8HL5yzw0X3/chKEbtAfAp9zf0urEVnoJWCWToQ9/TD9Y8nR6GRDg== X-Received: by 2002:adf:d1c2:0:b0:220:762f:fc64 with SMTP id b2-20020adfd1c2000000b00220762ffc64mr3940990wrd.253.1659694226180; Fri, 05 Aug 2022 03:10:26 -0700 (PDT) Received: from localhost ([2001:67c:1560:8007::aac:c03c]) by smtp.gmail.com with ESMTPSA id p13-20020a1c544d000000b003a3211112f8sm4054850wmi.46.2022.08.05.03.10.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 03:10:25 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU Jammy PATCH 3/3] fbmem: Check virtual screen sizes in fb_set_var() Date: Fri, 5 Aug 2022 13:09:49 +0300 Message-Id: <20220805100952.193179-10-cengiz.can@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220805100952.193179-1-cengiz.can@canonical.com> References: <20220805100952.193179-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Helge Deller Verify that the fbdev or drm driver correctly adjusted the virtual screen sizes. On failure report the failing driver and reject the screen size change. Signed-off-by: Helge Deller Reviewed-by: Geert Uytterhoeven Cc: stable@vger.kernel.org # v5.4+ CVE-2021-33655 (cherry picked from commit 6c11df58fd1ac0aefcb3b227f72769272b939e56) Signed-off-by: Cengiz Can --- drivers/video/fbdev/core/fbmem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 6f763baff4cfc..d983b1effbd2d 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1020,6 +1020,16 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) if (ret) return ret; + /* verify that virtual resolution >= physical resolution */ + if (var->xres_virtual < var->xres || + var->yres_virtual < var->yres) { + pr_warn("WARNING: fbcon: Driver '%s' missed to adjust virtual screen size (%ux%u vs. %ux%u)\n", + info->fix.id, + var->xres_virtual, var->yres_virtual, + var->xres, var->yres); + return -EINVAL; + } + if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_NOW) return 0;