From patchwork Fri Sep 23 22:31:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1681732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=TQ6F4kTS; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MZ6NL4jNWz1yq1 for ; Sat, 24 Sep 2022 08:32:34 +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 1obrDf-0005WB-QJ; Fri, 23 Sep 2022 22:32:27 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1obrDf-0005W0-2E for kernel-team@lists.ubuntu.com; Fri, 23 Sep 2022 22:32:27 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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-0.canonical.com (Postfix) with ESMTPS id C96C33F03F for ; Fri, 23 Sep 2022 22:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663972346; bh=zuVbtSNKbmpV1tSWW0Jtc0KY58f3XhV8lXjQBiGvkDs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TQ6F4kTS8AVceHJS6RWYt63kF5CeJUufVMZhUVyTpSTTdHjYMnpP1YlwzcYaJWo6v pQcj54ZbB0U7/9BltVxEgqafqF3QwQyt4ljfbwDktWD284YLYWHnwABb0jxlo7OfwF 4pHZ/2e/AhvBXVCi+wFP/S0pdodjUcM+2YP1zzXnGihJ4jIb82Sp467o/oQRgt7FLd yyeWXvJ47P0MWWO+mhhIPYTb1s4XwpVgTGpggqaGLq9vzNeGf19XqU25kfIkb7+r1J /qzK/3v1ZOUGhD3pvmgxnPFxMqw7gYqp9rysOe3E9OSJJrxFYNaar0eibAUnrf4vWv CeOcgVKJNz/vw== Received: by mail-ed1-f70.google.com with SMTP id w17-20020a056402269100b0045249bc17a9so906416edd.9 for ; Fri, 23 Sep 2022 15:32: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 :subject:date; bh=zuVbtSNKbmpV1tSWW0Jtc0KY58f3XhV8lXjQBiGvkDs=; b=rXE07eTCNCm+eMiWR5F9nPJYYWuCHxe5XikFLYBricnA9awC7LePTQj6BXCk9i8+4G PAGfV5WdF7kVLKBRuwhsa8db/HDjLrUMafxx8Rlm/9ip6ADfK32xQp8gSPwh4yr9iun9 F2iKw9fz1ocA15k2xu9B0P/m2Tea+vJ4eirKJjWtMVQGIVxQ8a2Wcc3fT5vkAwnGzkmN HBGDyst/ELAly8fZ+r/yzh8bCWeoSv0okFjdwSVUe2VlEDpRXKKjXCk2rvTVlhLXlA3+ GyF+dfSoGd/VwTiwQNwrh6Zsc2Q2nE/HY1e9WIzDwvgj1/Rmqhl/jN2uogoaaLKwtQYe I7xQ== X-Gm-Message-State: ACrzQf37d6vQO9M3r1cfQYaDaKbRZ0W7QPhTUYb15mhNYAXWD3BXE52U kMkK3j4b+9xGSnzTrS8H6t5TvdxyUyxw9Bm4Nxa8fnyEBJ3YRXZlQ0dJ26hodOaWdVtze3Vpoj2 7y/SrJVko+zkRr1E3yuZ8mFpQJ8FSADjI2EL6vsP3sA== X-Received: by 2002:a17:907:5c2:b0:77e:def7:65d8 with SMTP id wg2-20020a17090705c200b0077edef765d8mr9100636ejb.487.1663972346273; Fri, 23 Sep 2022 15:32:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6oEmB4uY2+i7Isne5+Sb7HzklkIwm8SIw0jzwuskyAZVSd940e37QOG+q6p+ILK9gPkKuvtg== X-Received: by 2002:a17:907:5c2:b0:77e:def7:65d8 with SMTP id wg2-20020a17090705c200b0077edef765d8mr9100627ejb.487.1663972346096; Fri, 23 Sep 2022 15:32:26 -0700 (PDT) Received: from localhost ([188.3.153.150]) by smtp.gmail.com with ESMTPSA id d12-20020a50fb0c000000b0044eb4227bf6sm6163087edq.63.2022.09.23.15.32.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 15:32:25 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU Bionic 1/1] UBUNTU: SAUCE: fbdev: remove redundant lock_fb_info Date: Sat, 24 Sep 2022 01:31:25 +0300 Message-Id: <20220923223123.410035-2-cengiz.can@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220923223123.410035-1-cengiz.can@canonical.com> References: <20220923223123.410035-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" BugLink: https://bugs.launchpad.net/bugs/1990690 One of the fixing commits for CVE-2021-33655, commit 159a96b199b4 ("fbcon: Prevent that screen size is smaller than font size") introduced a redundant lock_fb_info line into the ioctl flow in fbmem.c. This causes a deadlock when calling FBIOPUT_VSCREENINFO ioctl. Remove problematic lock_fb_info call. Signed-off-by: Cengiz Can Acked-by: Thadeu Lima de Souza Cascardo --- drivers/video/fbdev/core/fbmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 1238cc9f42c03..78adcfa11d010 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1150,7 +1150,6 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, ret = fb_set_var(info, &var); info->flags &= ~FBINFO_MISC_USEREVENT; } - lock_fb_info(info); unlock_fb_info(info); console_unlock(); if (!ret && copy_to_user(argp, &var, sizeof(var)))