From nobody Thu Apr 04 12:44:09 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9LsQ1zGNz5GxCb; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9LsQ18K7z468t; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712234650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJsQEz479fLuvk0+xsaf4mUnJAR9LPoq4FQNgt1fH3k=; b=V62rTYu2PajkJk+y71unQw15Vs4B6hPJIH0Dka5I+vWCqrSwscntoVKNEN7hTIXMGSHI/A 8G2739nBPnL/ddtEYb8kB/Eu/agnzPG7Hml0URB3HyZm+HDM2OUntH2ARsG6aTMPe3RAFi YiWV/H9di24OnuExWwCMnpVN2KNuwiGbP5xsLEj3hmSt8qUES8i7IMLn4wcuneNSM1214P zwjndlP9ZemHBSBq7sWkmb0MtX50VhcYudDj7eCU/aop+M/LqzBxrUwLKpzHe9blgqAFbN dYdoiVwF8yuJjmANP3XbfghcMvcm90JSxHcRL3e1Il0X8od1bafqVWKuB7wkCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712234650; a=rsa-sha256; cv=none; b=eRsA54sgqzHZ03W72iUXXBQMRhmTnQuZnEovbRuxXGZq6qEceaNkvvsE8YluKGlGazkdQf PvAAjGFbaSg6ZVpqhoqmniOpT37mA6lhuSbkxhWNN6YjLx8Z3exhuDUyrLV26RGzs72SdY FmlKamFGYzjKZ14KXkGpjz2A6MJXE3O2fZPST2YN1no6trbX++ZEtnsr+Q4swcm9Mm0RmR Xwd+Kr+abuS+HhcNyOELuTYm2K/JCXNBZeCGnR8vpFky6xBl0krgMQZuxcozdmr3d+GLBX QpMfYo5lyxd3VaiAK2/yEr/doOa9Y7BYXrr9QxyiD+8Vvky2WkpJOC4E2aaraA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712234650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJsQEz479fLuvk0+xsaf4mUnJAR9LPoq4FQNgt1fH3k=; b=UDxDkuPRKy0sjzUqsrzNGz2vn0SGFbrqdRl7K9oO3Dveel5PBaczAMdyOwKjlQWs0aZqZJ ezhQWIzyg0dsUOmpH3n8MxR2aeLa+0YK8ErHUvVPxJ7EKJrOHvpWy2ys3iRMd/WoD7umEP t+0zJWxseao05eh58FtGxMI7RF810cuNQ03Wv4ws8o9wqfvcFYz1frGl5JmWYNSK5IepKB u75H2nn9qTOL8+94QL401MqE43gqoQF86JlIh4WSq6TEW4E+4jXaqLnlOcUMYbJCdlFA62 dxUEfnJ2+oahJ/7sE/4fhLgrMxGk2GjSnrhAtwHC0Vw6Is3B8HLCGz8LhlpZ9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9LsQ0kSvzHRb; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434CiATW078169; Thu, 4 Apr 2024 12:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Ci9lX078166; Thu, 4 Apr 2024 12:44:09 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:44:09 GMT Message-Id: <202404041244.434Ci9lX078166@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c302c31eba10 - 2024Q1 - x11-servers/xwayland-devel: adjust upstream reference after 77f72c463b90 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: c302c31eba10db78e273b3ee4df494439fe63ca9 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c302c31eba10db78e273b3ee4df494439fe63ca9 commit c302c31eba10db78e273b3ee4df494439fe63ca9 Author: Jan Beich AuthorDate: 2024-04-04 12:20:45 +0000 Commit: Jan Beich CommitDate: 2024-04-04 12:42:26 +0000 x11-servers/xwayland-devel: adjust upstream reference after 77f72c463b90 Only using 1 rebased patch from 23.2 branch as the rest apply fine "as is". --- bdca6c3d1f50.patch 2024-04-04 00:37:36 UTC +++ 01941a831811.patch 2024-04-04 09:39:24 UTC @@ -1,4 +1,4 @@ -From bdca6c3d1f5057eeb31609b1280fc93237b00c77 Mon Sep 17 00:00:00 2001 +From 01941a831811c9fd47ffed5ea96375abeb20c9fc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 30 Jan 2024 13:13:35 +1000 Subject: [PATCH] render: fix refcounting of glyphs during ProcRenderAddGlyphs @@ -20,15 +20,17 @@ Jan-Niklas Sohn working with Trend Micro Zero Day Init This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative -Part-of: +(backported from commit bdca6c3d1f5057eeb31609b1280fc93237b00c77) + +Part-of: --- - render/glyph.c | 5 +++-- - render/glyphstr_priv.h | 1 + - render/render.c | 15 +++++++++++---- - 3 files changed, 15 insertions(+), 6 deletions(-) + render/glyph.c | 5 +++-- + render/glyphstr.h | 3 +++ + render/render.c | 15 +++++++++++---- + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/render/glyph.c b/render/glyph.c -index 850ea8440d..13991f8a12 100644 +index f3ed9cf4c1..d5fc5f3c91 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -245,10 +245,11 @@ FreeGlyphPicture(GlyphPtr glyph) @@ -53,20 +55,22 @@ + glyph->refcnt = 1; glyph->size = size + sizeof(xGlyphInfo); glyph->info = *gi; dixInitPrivates(glyph, (char *) glyph + head_size, PRIVATE_GLYPH); -diff --git a/render/glyphstr_priv.h b/render/glyphstr_priv.h -index 90a90fa4f6..dd1bc54825 100644 ---- a/render/glyphstr_priv.h -+++ b/render/glyphstr_priv.h -@@ -56,6 +56,7 @@ void AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id); - Bool DeleteGlyph(GlyphSetPtr glyphSet, Glyph id); - GlyphPtr FindGlyph(GlyphSetPtr glyphSet, Glyph id); - GlyphPtr AllocateGlyph(xGlyphInfo * gi, int format); -+void FreeGlyph(GlyphPtr glyph, int format); - Bool ResizeGlyphSet(GlyphSetPtr glyphSet, CARD32 change); - GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format); - int FreeGlyphSet(void *value, XID gid); +diff --git a/render/glyphstr.h b/render/glyphstr.h +index 2f51bd244a..fb6589d3e2 100644 +--- a/render/glyphstr.h ++++ b/render/glyphstr.h +@@ -102,6 +102,9 @@ HashGlyph(xGlyphInfo * gi, + extern void + AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id); + ++extern void ++FreeGlyph(GlyphPtr glyph, int format); ++ + extern Bool + DeleteGlyph(GlyphSetPtr glyphSet, Glyph id); + diff --git a/render/render.c b/render/render.c -index 29c5055c62..fe5e37dd9a 100644 +index 456f156d43..5bc2a204b7 100644 --- a/render/render.c +++ b/render/render.c @@ -1076,6 +1076,7 @@ ProcRenderAddGlyphs(ClientPtr client) Reported by: manu --- x11-servers/xwayland-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 2edd4156938c..5fa6714f7f49 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -14,7 +14,7 @@ PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 PATCHFILES+= 3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 PATCHFILES+= 6c684d035c06.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= 01941a831811.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 +PATCHFILES+= 01941a831811.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1464 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot)