From 90c434caaa013c43802677be46fa0609f98e3ee4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 11 2021 08:19:43 +0000
Subject: import gnome-shell-3.32.2-43.el8


---

diff --git a/SOURCES/0001-loginDialog-Reset-auth-prompt-on-vt-switch-before-fa.patch b/SOURCES/0001-loginDialog-Reset-auth-prompt-on-vt-switch-before-fa.patch
new file mode 100644
index 0000000..85cdbbb
--- /dev/null
+++ b/SOURCES/0001-loginDialog-Reset-auth-prompt-on-vt-switch-before-fa.patch
@@ -0,0 +1,49 @@
+From 6d26b6f9f66e14843f175305441a2464dd255fd1 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 27 Jul 2020 10:58:49 -0400
+Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in
+
+At the moment, if a user switches to the login screen vt,
+the login screen fades in whatever was on screen prior, and
+then does a reset.
+
+It makes more sense to reset first, so we fade in what the
+user is going to interact with instead of what they interacted
+with before.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997
+---
+ js/gdm/loginDialog.js | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index 214c2f512..eb6846d5c 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
+@@ -923,6 +923,9 @@ var LoginDialog = GObject.registerClass({
+         if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+             return;
+ 
++        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
++            this._authPrompt.reset();
++
+         Tweener.addTween(this,
+                          { opacity: 255,
+                            time: _FADE_ANIMATION_TIME,
+@@ -935,12 +938,7 @@ var LoginDialog = GObject.registerClass({
+                                        children[i].opacity = this.opacity;
+                                }
+                            },
+-                           onUpdateScope: this,
+-                           onComplete() {
+-                               if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+-                                   this._authPrompt.reset();
+-                           },
+-                           onCompleteScope: this });
++                           onUpdateScope: this });
+     }
+ 
+     _gotGreeterSessionProxy(proxy) {
+-- 
+2.32.0
+
diff --git a/SPECS/gnome-shell.spec b/SPECS/gnome-shell.spec
index 3314e65..113c708 100644
--- a/SPECS/gnome-shell.spec
+++ b/SPECS/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.32.2
-Release:        42%{?dist}
+Release:        43%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@ Patch20002: 0002-extensionSystem-Get-rid-of-_enabled-boolean-optimiza.patch
 Patch20003: 0003-extensionSystem-Allow-extensions-to-run-on-the-login.patch
 Patch20004: 0004-sessionMode-Allow-extensions-at-the-login-and-unlock.patch
 
+# CVE-2020-17489
+Patch30001: 0001-loginDialog-Reset-auth-prompt-on-vt-switch-before-fa.patch
+
 %define libcroco_version 0.6.8
 %define eds_version 3.17.2
 %define gnome_desktop_version 3.7.90
@@ -272,6 +275,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Oct 21 2021 Florian Müllner <fmuellner@redhat.com> - 3.32.2-43
+- Backport fix for CVE-2020-17489
+  Resolves: #1874259
+
 * Wed Oct 20 2021 Florian Müllner <fmuellner@redhat.com> - 3.32.2-42
 - Backport WPA3 support
   Resolves: #1924593