[xsrc/netbsd-10]: xsrc/external/mit Pull up following revision(s) (requested ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/bfcec9c68fa5
branches:  netbsd-10
changeset: 7511:bfcec9c68fa5
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Apr 01 15:21:44 2023 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #135):

        xsrc/external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.24
        xsrc/external/mit/xorg-server/dist/configure         up to 1.17
        xsrc/external/mit/xorg-server/dist/configure.ac      up to 1.19
        xsrc/external/mit/xorg-server/dist/meson.build       up to 1.1.1.14
        xsrc/external/mit/xorg-server/dist/composite/compwindow.c up to 1.1.1.9
        xsrc/external/mit/xorg-server/dist/xkb/xkbUtils.c    up to 1.1.1.8
        xsrc/external/mit/xorg-server/include/dix-config.h   up to 1.50
        xsrc/external/mit/xorg-server/include/version-config.h up to 1.20
        xsrc/external/mit/xorg-server/include/xorg-config.h  up to 1.30
        xsrc/external/mit/xorg-server/include/xorg-server.h  up to 1.30
        xsrc/external/mit/xorg-server.old/dist/composite/compwindow.c: revision 1.2

Sync src/external/mit/xorg-server with head to fix ZDI-CAN-19866 and
CVE-2023-1393, a use-after-free problem.

Pull across fixes for ZDI-CAN-19866 / CVE-2023-1393: to xorg-server.old

diffstat:

 external/mit/xorg-server.old/dist/composite/compwindow.c |     5 +
 external/mit/xorg-server/dist/ChangeLog                  |  1206 +++++++------
 external/mit/xorg-server/dist/composite/compwindow.c     |     5 +
 external/mit/xorg-server/dist/configure                  |    28 +-
 external/mit/xorg-server/dist/configure.ac               |     4 +-
 external/mit/xorg-server/dist/meson.build                |     4 +-
 external/mit/xorg-server/dist/xkb/xkbUtils.c             |     4 +-
 external/mit/xorg-server/include/dix-config.h            |     2 +-
 external/mit/xorg-server/include/version-config.h        |     4 +-
 external/mit/xorg-server/include/xorg-config.h           |     2 +-
 external/mit/xorg-server/include/xorg-server.h           |     2 +-
 11 files changed, 658 insertions(+), 608 deletions(-)

diffs (truncated from 5445 to 300 lines):

diff -r 9c276cc348c5 -r bfcec9c68fa5 external/mit/xorg-server.old/dist/composite/compwindow.c
--- a/external/mit/xorg-server.old/dist/composite/compwindow.c  Wed Feb 08 17:13:59 2023 +0000
+++ b/external/mit/xorg-server.old/dist/composite/compwindow.c  Sat Apr 01 15:21:44 2023 +0000
@@ -588,6 +588,11 @@ compDestroyWindow (WindowPtr pWin)
     ret = (*pScreen->DestroyWindow) (pWin);
     cs->DestroyWindow = pScreen->DestroyWindow;
     pScreen->DestroyWindow = compDestroyWindow;
+
+    /* Did we just destroy the overlay window? */
+    if (pWin == cs->pOverlayWin)
+        cs->pOverlayWin = NULL;
+
 /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
     return ret;
 }
diff -r 9c276cc348c5 -r bfcec9c68fa5 external/mit/xorg-server/dist/ChangeLog
--- a/external/mit/xorg-server/dist/ChangeLog   Wed Feb 08 17:13:59 2023 +0000
+++ b/external/mit/xorg-server/dist/ChangeLog   Sat Apr 01 15:21:44 2023 +0000
@@ -1,3 +1,43 @@
+commit 7c791b15504cc86a929acaa88161f012cdbba59f
+Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
+Date:   Wed Mar 29 13:58:30 2023 +0200
+
+    xserver 21.1.8
+    
+    Signed-off-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+
+commit fb51d5dd53b02422ea3b6f36bd017488d41f472d
+Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
+Date:   Mon Mar 13 11:08:47 2023 +0100
+
+    composite: Fix use-after-free of the COW
+    
+    ZDI-CAN-19866/CVE-2023-1393
+    
+    If a client explicitly destroys the compositor overlay window (aka COW),
+    we would leave a dangling pointer to that window in the CompScreen
+    structure, which will trigger a use-after-free later.
+    
+    Make sure to clear the CompScreen pointer to the COW when the latter gets
+    destroyed explicitly by the client.
+    
+    This vulnerability was discovered by:
+    Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+    
+    Signed-off-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+    Reviewed-by: Adam Jackson <ajax%redhat.com@localhost>
+    (cherry picked from commit 26ef545b3502f61ca722a7a3373507e88ef64110)
+
+commit 6bed5cfd515b9634ecf73fb884e4ec3388e8b7eb
+Author: Benno Schulenberg <bensberg%telfort.nl@localhost>
+Date:   Mon Mar 27 20:03:56 2023 +0200
+
+    xkbUtils: use existing symbol names instead of deleted deprecated ones
+    
+    Symbols `XK_Cyrillic_DZHE` and `XK_Serbian_DZE` were pure synonyms.
+    
+    (cherry picked from commit 6153c71cfb4698f1a416266564ecc748e4a25f2c)
+
 commit af9111ac7fa399a5a33fbfa145060e1850f41e0e
 Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 Date:   Tue Feb 7 10:30:37 2023 +1000
@@ -13000,7 +13040,7 @@ Date:   Thu Jul 28 14:26:38 2016 +0100
     Also add similar to meson.build
 
 commit 29a8baa031a87ef44d1e5320ecec5015d26fd385
-Merge: 2aec5c3c81 56c0a71fdd
+Merge: 2aec5c3c8 56c0a71fd
 Author: Aaron Plattner <aplattner%nvidia.com@localhost>
 Date:   Fri May 17 08:39:50 2019 -0700
 
@@ -31051,7 +31091,7 @@ Date:   Fri Oct 28 09:28:32 2016 -0700
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 356db2340f5b473a7191c7969586ca5b0396c48f
-Merge: 9ed5b26354 03d99ef729
+Merge: 9ed5b2635 03d99ef72
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Fri Oct 28 09:05:54 2016 -0700
 
@@ -32992,7 +33032,7 @@ Date:   Sun Sep 11 03:07:44 2016 -0700
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 265c4e66533243b60d92cffc7769ecadb0292c8d
-Merge: 3caf671ed2 f5f4d32ac7
+Merge: 3caf671ed f5f4d32ac
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Thu Sep 15 21:32:46 2016 -0700
 
@@ -34177,7 +34217,7 @@ Date:   Fri Jul 29 17:45:45 2016 -0700
     Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer%amd.com@localhost>
 
 commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a
-Merge: d2558f063a 8bb9d460fb
+Merge: d2558f063 8bb9d460f
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Sat Aug 13 09:12:19 2016 -0700
 
@@ -36376,7 +36416,7 @@ Date:   Tue May 10 00:29:58 2016 +0000
     Signed-off-by: Guilherme Quentel Melo <gqmelo%gmail.com@localhost>
 
 commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36
-Merge: fa7b70a9b8 848089e0dd
+Merge: fa7b70a9b 848089e0d
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Jun 20 11:21:40 2016 -0400
 
@@ -37019,7 +37059,7 @@ Date:   Wed Mar 9 10:31:13 2016 +0100
     Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 
 commit 3735ab965a4642273d070840bda4e827991e5219
-Merge: 7c77c42fe8 43dbc556f3
+Merge: 7c77c42fe 43dbc556f
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Thu Jun 2 07:47:16 2016 -0700
 
@@ -42784,7 +42824,7 @@ Date:   Mon Sep 21 07:16:12 2015 +0100
     Reviewed-by: Adam Jackson <ajax%redhat.com@localhost>
 
 commit 5b582a4a0350c253d729efb31b710851ae9a958e
-Merge: 1d4aa67242 27ad21254f
+Merge: 1d4aa6724 27ad21254
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Oct 19 12:23:22 2015 -0400
 
@@ -43395,7 +43435,7 @@ Date:   Fri Sep 25 14:04:34 2015 +0100
     Reviewed-by: Michel Dänzer <michel.daenzer%amd.com@localhost>
 
 commit dca5770af9e20bb1148374ebfd60931a81b148a2
-Merge: a31bbc450a 21f384b7b8
+Merge: a31bbc450 21f384b7b
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Fri Sep 25 10:23:28 2015 -0400
 
@@ -44029,7 +44069,7 @@ Date:   Mon Sep 21 15:23:23 2015 -0400
     Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
 
 commit b25f7d0c165c4d32c73fbdf9080012503d319ba1
-Merge: db1089eafc 1ba4fde101
+Merge: db1089eaf 1ba4fde10
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Mon Sep 21 17:34:48 2015 -0400
 
@@ -44652,7 +44692,7 @@ Date:   Tue Jul 7 18:19:50 2015 +0200
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 7ecdfbf0af3547295b245efa754123db65cabb43
-Merge: bca4f4b56c a0b4f30b1f
+Merge: bca4f4b56 a0b4f30b1
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Aug 17 18:53:25 2015 -0700
 
@@ -44899,7 +44939,7 @@ Date:   Thu Jul 16 15:12:52 2015 -0700
     Signed-off-by: Eric Anholt <eric%anholt.net@localhost>
 
 commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc
-Merge: cb695b0f3b 7b0f940625
+Merge: cb695b0f3 7b0f94062
 Author: Eric Anholt <eric%anholt.net@localhost>
 Date:   Fri Jul 17 10:15:01 2015 -0700
 
@@ -45506,7 +45546,7 @@ Date:   Tue Jun 30 14:54:42 2015 +1000
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 991712f1e8deeb6289ee0abd9910e279d6396246
-Merge: 0cd228073a 3c859112d3
+Merge: 0cd228073 3c859112d
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Wed Jul 8 10:43:31 2015 -0700
 
@@ -46058,28 +46098,28 @@ Date:   Tue May 12 14:19:15 2015 -0400
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a
-Merge: b22534d8e6 13c7d53df8
+Merge: b22534d8e 13c7d53df
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Jun 29 21:04:53 2015 -0700
 
     Merge remote-tracking branch 'airlied/for-keithp'
 
 commit b22534d8e653575196180970292eaade33c090a8
-Merge: 0a625adeec 780a69aff0
+Merge: 0a625adee 780a69aff
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Jun 29 21:04:11 2015 -0700
 
     Merge remote-tracking branch 'jwrdecoede/for-keith'
 
 commit 0a625adeec465d6c7dcdb8622c53157b4e932bb0
-Merge: 84128c10bb 790311cec3
+Merge: 84128c10b 790311cec
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Jun 29 21:01:34 2015 -0700
 
     Merge remote-tracking branch 'anholt/glamor-next'
 
 commit 84128c10bb6d34f78f7a4148b3c640748efe58e1
-Merge: 9003a3e5c5 8c86dd5160
+Merge: 9003a3e5c 8c86dd516
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Jun 29 20:59:31 2015 -0700
 
@@ -47103,14 +47143,14 @@ Date:   Tue Mar 17 10:21:12 2015 +0900
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b
-Merge: c39c3a9750 23702dd268
+Merge: c39c3a975 23702dd26
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon May 11 16:50:43 2015 -0700
 
     Merge remote-tracking branch 'evelikov/master'
 
 commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a
-Merge: 6b65e96189 7470578520
+Merge: 6b65e9618 747057852
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon May 11 16:34:48 2015 -0700
 
@@ -47129,7 +47169,7 @@ Date:   Wed May 6 15:07:21 2015 +1200
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit d7091a21d90cf463ae39ec5e8741123218ec5686
-Merge: c3ce9d8fd4 8fb8bbb306
+Merge: c3ce9d8fd 8fb8bbb30
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon May 11 15:49:34 2015 -0700
 
@@ -47197,7 +47237,7 @@ Date:   Sat Apr 25 21:19:25 2015 +0200
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b
-Merge: 28ff661e73 c7b49bdbb9
+Merge: 28ff661e7 c7b49bdbb
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon May 11 15:36:53 2015 -0700
 
@@ -47861,7 +47901,7 @@ Date:   Tue Dec 30 09:13:15 2014 -0800
     Acked-by: Alex Deucher <alexander.deucher%amd.com@localhost>
 
 commit e608f3521eaaab972a3eea62aa04a65958351c1c
-Merge: d3b9c47c84 5de1383070
+Merge: d3b9c47c8 5de138307
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Tue Mar 31 09:06:08 2015 -0700
 
@@ -47933,7 +47973,7 @@ Date:   Tue Mar 31 11:18:44 2015 +1000
     Signed-off-by: Dave Airlie <airlied%redhat.com@localhost>
 
 commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5
-Merge: 95e83ff87a e977b404d7
+Merge: 95e83ff87 e977b404d
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Fri Mar 27 06:45:56 2015 -0700
 
@@ -49422,7 +49462,7 @@ Date:   Thu Jan 15 22:03:18 2015 +0100
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1
-Merge: 4e12d7b6f4 4301479508
+Merge: 4e12d7b6f 430147950
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Sat Jan 10 14:51:57 2015 +1300
 
@@ -49506,7 +49546,7 @@ Date:   Sun Jan 4 19:13:35 2015 -0800
     Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 
 commit 1c01633877caa4239f901f02fbe113926318d030
-Merge: 3573855514 e774663fa5
+Merge: 357385551 e774663fa
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Sun Jan 4 17:02:25 2015 -0800
 
@@ -50249,7 +50289,7 @@ Date:   Mon Dec 1 16:06:17 2014 -0500
     Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
 
 commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0
-Merge: 8aa23f27c7 1559a94395
+Merge: 8aa23f27c 1559a9439
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Tue Dec 9 11:47:11 2014 -0800
 
@@ -50847,14 +50887,14 @@ Date:   Fri Jan 17 18:54:03 2014 -0800
     Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 
 commit 3e7218a6c23354d66f508b18164cac98a346b3ee
-Merge: 6f4c398a0e bc71081f0e
+Merge: 6f4c398a0 bc71081f0
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Dec 8 18:07:55 2014 -0800
 
     Merge remote-tracking branch 'jturney/indirect-glx-fixes'
 
 commit 6f4c398a0e632b0c92e3cb8ee03ca7f5b5cc018e
-Merge: aae6460694 5920433c3a
+Merge: aae646069 5920433c3
 Author: Keith Packard <keithp%keithp.com@localhost>
 Date:   Mon Dec 8 18:04:08 2014 -0800