From patchwork Mon Aug 24 06:49:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Anusuri X-Patchwork-Id: 96131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 242FAC5DF9D for ; Mon, 24 Aug 2026 06:50:05 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11017.1787554195816831908 for ; Sun, 23 Aug 2026 23:49:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@mvista.com header.s=google header.b=AGFW8i0q; spf=pass (domain: mvista.com, ip: 209.85.216.47, mailfrom: vanusuri@mvista.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-383cb94f742so3202983a91.3 for ; Sun, 23 Aug 2026 23:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista.com; s=google; t=1787554195; x=1788158995; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=oKJEer1BZOi3/9xxfZtl6IFAPMkeMOGuk95foBRhYgQ=; b=AGFW8i0qyUim6hm99ryz/b2JhOHcazA4tJmI0y+Rg247oMWcgyAeM+LeuUh86mroLo mqyoF6BvjHZNOzY7iwyUS0+33Gxlmvhzfm0HLOCxWjuKcvgPNo10fuT1/YB4zVrNKP4d cW9NwYYQqkdlagHvKPNcvWjYBBy0tOoedS0/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787554195; x=1788158995; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oKJEer1BZOi3/9xxfZtl6IFAPMkeMOGuk95foBRhYgQ=; b=qNXNtDts1FT1rlDeiuNlXu14K9CigAntseRGLYBeaNVQmvQaEPJiFpWwcMNuL8+IS6 FqJ7JFP/iuHWQ6FliBhgnlT0o09KhKfq4A9jomKhXTnL+OgHfIE+rb356P837YoJD/3B lxSUrzZIJhUR+cAiWCxZpRzIBh/1K3/w2SFlHI2W0GOoVERStRgNa4rnrANW+5/5RSP9 BpN7g5/pp+40+Db1sxyvUijdrXHqyOuTWh2jgkaeHuTHQg1GGgCM0nE4RKmHOzOHejbB MqZZLbvz9QzHZJs07JVag5CwyRFfxGeFXV2q7ZkO9tYidhaUx7H9EnHrPnLDkNdYkhoH 7flw== X-Gm-Message-State: AFuF++kx7OFCF5/pEOL98G7RiXiHxsSunOtgZJrSj6QsZawtWp2hvThd 7+1TjLvklqkHNFXexQZDTx0LISjq8xVK2GIb87X8L3XYNKhV34OTJlFJ7zTmZG9X7OaEdGLlKx7 mWHhC X-Gm-Gg: AR+sD10KzLafNRRUNXeUoiM97U/1bIrtTO4S6nJrTcfdB6QWvs4izs85lVSlARzcI+l e4hEE20gQEY5tD/NziuE+oE+8tIbVv7Jd1xZxKvEuVkImG2N/cQWpXWLrMyiRUny8yja8Nh7NvW lMBU6NJrwcn5xYouRdIWfmTJ5s8ZJ+D3s523KL+EJ7pxvEJ6eJCslhwq7ShyeMoZyfpB50BkU5S MOEzpNZfKO/0tEupvXl5AsxNr4dPsVgd8Z+HXJJb5Su0KFxvZtTNAYcwvAVE1WE+1kF69RbD0Q7 fuA8ARqZZdECIKHUyTnxLQBecy4W6o6WnalxtsFZT6/1zT6IFgg5S5+f3owJofdhUK1Cwb6TB2W qpNrlAa4bqVAScLmob+qTh3ZwohbzkhsLgnQjm2AnZ8xdIStKT+F9pFYfq9YR4q8aFseGxucjkU 47nnvSCRj3dt3/kQE37CxX9z8NFq1xclZ9J+JxZ5s4UYkC7TcZgu62zSAPoMUCvgSM X-Received: by 2002:a17:90b:3883:b0:380:540:d499 with SMTP id 98e67ed59e1d1-395def03e79mr27814773a91.6.1787554195054; Sun, 23 Aug 2026 23:49:55 -0700 (PDT) Received: from MVIN00352.local ([182.74.28.237]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-141860ef75esm21780215c88.7.2026.08.23.23.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2026 23:49:54 -0700 (PDT) From: Vijay Anusuri To: openembedded-core@lists.openembedded.org Cc: Vijay Anusuri Subject: [OE-core][wrynose][patch 1/3] libxfont: Fix CVE-2026-56001 Date: Mon, 24 Aug 2026 12:19:42 +0530 Message-ID: <20260824064944.29802-1-vanusuri@mvista.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Aug 2026 06:50:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244066 Pick patch according to [2] [1] https://nvd.nist.gov/vuln/detail/CVE-2026-56001 [2] https://security-tracker.debian.org/tracker/CVE-2026-56001 Signed-off-by: Vijay Anusuri --- .../xorg-lib/libxfont/CVE-2026-56001.patch | 84 +++++++++++++++++++ .../xorg-lib/libxfont_1.5.4.bb | 3 + 2 files changed, 87 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56001.patch diff --git a/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56001.patch b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56001.patch new file mode 100644 index 0000000000..506a2dc22a --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56001.patch @@ -0,0 +1,84 @@ +From be0b08e2d354138d3222b4490e2a77c6ee42f778 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 1 Jun 2026 16:46:10 +1000 +Subject: [PATCH] bitscale: fix integer overflow in BitmapScaleBitmaps + bytestoalloc + +bytestoalloc is declared as unsigned int (32-bit). When the sum of +per-glyph byte counts exceeds 2^32, the value wraps around and calloc() +allocates a buffer that is too small. The subsequent ScaleBitmap loop +then writes past the end of the allocated buffer. + +Change bytestoalloc from unsigned int to size_t to match the actual +allocation size type, and add an explicit overflow check in the +accumulation loop to bail out if the total would exceed SIZE_MAX. + +This vulnerability was discovered by: +Anonymous working with TrendAI Zero Day Initiative + +CVE-2026-56001/ZDI-CAN-30558 + +Assisted-by: Claude:claude-opus-4-6 +Signed-off-by: Peter Hutterer +Part-of: + +Upstream-Status: Backport [import from debian libxfont1 1.5.2-4+deb9u1 +Upstream commit https://gitlab.freedesktop.org/xorg/lib/libxfont/-/commit/be0b08e2d354138d3222b4490e2a77c6ee42f778] +CVE: CVE-2026-56001 +Signed-off-by: Vijay Anusuri +--- + src/bitmap/bitscale.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c +index 13ed924..c87fa96 100644 +--- a/src/bitmap/bitscale.c ++++ b/src/bitmap/bitscale.c +@@ -38,6 +38,7 @@ from The Open Group. + #include + #include + #include ++#include + + #ifndef MAX + #define MAX(a,b) (((a)>(b)) ? a : b) +@@ -1459,7 +1460,7 @@ BitmapScaleBitmaps(FontPtr pf, /* scaled font */ + opci; + FontInfoPtr pfi; + int glyph; +- unsigned bytestoalloc = 0; ++ size_t bytestoalloc = 0; + int firstCol, lastCol, firstRow, lastRow; + + double xform[4], inv_xform[4]; +@@ -1486,8 +1487,25 @@ BitmapScaleBitmaps(FontPtr pf, /* scaled font */ + glyph = pf->glyph; + for (i = 0; i < nchars; i++) + { +- if ((pci = ACCESSENCODING(bitmapFont->encoding, i))) +- bytestoalloc += BYTES_FOR_GLYPH(pci, glyph); ++ if ((pci = ACCESSENCODING(bitmapFont->encoding, i))) { ++ size_t glyphsize = BYTES_FOR_GLYPH(pci, glyph); ++ if (bytestoalloc > SIZE_MAX - glyphsize) { ++ fprintf(stderr, ++ "Error: bitmap allocation overflow for scaled font\n"); ++ goto bail; ++ } ++ bytestoalloc += glyphsize; ++ } ++ } ++ ++ /* Reject unreasonably large bitmap allocations that could result ++ * from malicious fonts with extreme scale factors. 256 MiB is ++ * far beyond any legitimate scaled bitmap font. */ ++#define BITMAP_SCALE_MAX_ALLOC (256 * 1024 * 1024) ++ if (bytestoalloc > BITMAP_SCALE_MAX_ALLOC) { ++ fprintf(stderr, ++ "Error: scaled bitmap size %zu exceeds limit\n", bytestoalloc); ++ goto bail; + } + + /* Do we add the font malloc stuff for VALUE ADDED ? */ +-- +2.43.0 + diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 9ec7cc30f5..59c489b785 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -19,6 +19,9 @@ XORG_EXT = "tar.bz2" BBCLASSEXTEND = "native" +SRC_URI += "file://CVE-2026-56001.patch \ + " + SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" From patchwork Mon Aug 24 06:49:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Anusuri X-Patchwork-Id: 96130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D48A8C5DF94 for ; Mon, 24 Aug 2026 06:50:04 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.11074.1787554201566305077 for ; Sun, 23 Aug 2026 23:50:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@mvista.com header.s=google header.b=bCh7XVNg; spf=pass (domain: mvista.com, ip: 209.85.214.174, mailfrom: vanusuri@mvista.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso43119415ad.2 for ; Sun, 23 Aug 2026 23:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista.com; s=google; t=1787554201; x=1788159001; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=GyU0u0JoGxTWfJTj1W2eB1WdCbL8o7XZeeMToplDUno=; b=bCh7XVNgjdgqG0Q/TU5tQq5T9Ix5uxJBbceZ3hnz0SllhYSKPG5AOp13gCEgihllI3 jQxMJJ83/tP1L8TZid9OVW+6xRx+lSIXW0gg9NTJWbhOXy2QmvcUTnnXFDd67vLbEQo9 7IHsfFExCzhgVIyDqkvi7lVd+Fp1Q5qkyFHQA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787554201; x=1788159001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=GyU0u0JoGxTWfJTj1W2eB1WdCbL8o7XZeeMToplDUno=; b=k1XGS6nCqrwFmIQuGp/V0WwTcGuhXyPhKWzyzqJ5avNvRaNLwWP3FMFF+kpYVRmCF0 W2igyUKz0ePgjnGdCaZMB87PY7ml6leSVPUhMqkoIi6YpGg+vpW4FlOzr/YQE3b38K+K mlIfWCQhSqj4R5buzunpPbGNJ4t3Vk37vVKQMuEE0swx6VbiB71pFASrwS5+ERsY7OSd PzVSMTgz+7P9kO1+dO3JBGaSnkwzu48/ox2aAmDNbGrXlRj4rW9abYAXHIBR63lkLva/ 59Aa9qQ/zYGtv7V8IuRKZ9I2RVAFVkaJNgQ7oDRIaUoPndVRWrzEAtEvcFC6fCJJpayQ ty0g== X-Gm-Message-State: AFuF++kHXKEpx0vn85D2fTjrabBqsZ5Q7sQ4yceCe9czj6mU9BDo1pRW L+aRTxoTtkmA3/72Esdcq6FsWTh12ijbeZSIwbs+fsGvTcOVTepCb2VM2ibBmMDDm0ys6jJ4q1k OOeaJ X-Gm-Gg: AR+sD11vGAUmIpQlJ74uHwu+sFe0EquFHxbtcmJJHz5LtILCtUSeAt3orpFO+OheGCY LmKLCcwXE4/OeeGRsUiF4ZXrD+BjK4kLhW+7qFqsYaWJ65Uss6UYwHpv5byhj+zSQTEIiVBGA9/ I+qHivOF5w/EwMvcjFYRd3Rsy4J7eKRAaMs/7jyCcH0iNSL83wPB3eKAAVCZHBkpYUR2P85f5uh G32kNLUMP7HtyysAeTZm1eqEjG5ck0W8lOsya8zVaFDC14FsZ1QChFqRXS2wjkmGxqYQDH87B6j WW3HeHBw4x7xg6BATrpMMZNB1nQ6m8Mpynt7XkU+U/Lb4Qipm0uB0wE0bKef7GKyb1L2zgV2RYQ +bxYDHUxdIEOgDLO/XhnqhggQufuSL/VF8wvf31W9RbvG8Bn5T/xCu9G4LVnUByWKSonCrnq8DP a7YhTkX2EaQA1k64qYmCH0nVlFN9krfXYpnYuAAz++/uEbBwpMAbmMkQb2jIDdQh777bm90/1Yk AM= X-Received: by 2002:a17:90b:2d91:b0:38e:2e86:ed02 with SMTP id 98e67ed59e1d1-395c39cd288mr46946955a91.14.1787554200670; Sun, 23 Aug 2026 23:50:00 -0700 (PDT) Received: from MVIN00352.local ([182.74.28.237]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-141860ef75esm21780215c88.7.2026.08.23.23.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2026 23:49:59 -0700 (PDT) From: Vijay Anusuri To: openembedded-core@lists.openembedded.org Cc: Vijay Anusuri Subject: [OE-core][wrynose][patch 2/3] libxfont: Fix CVE-2026-56002 Date: Mon, 24 Aug 2026 12:19:43 +0530 Message-ID: <20260824064944.29802-2-vanusuri@mvista.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260824064944.29802-1-vanusuri@mvista.com> References: <20260824064944.29802-1-vanusuri@mvista.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Aug 2026 06:50:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244067 Pick patch according to [2] [1] https://nvd.nist.gov/vuln/detail/CVE-2026-56002 [2] https://security-tracker.debian.org/tracker/CVE-2026-56002 Signed-off-by: Vijay Anusuri --- .../xorg-lib/libxfont/CVE-2026-56002.patch | 147 ++++++++++++++++++ .../xorg-lib/libxfont_1.5.4.bb | 1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56002.patch diff --git a/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56002.patch b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56002.patch new file mode 100644 index 0000000000..a615c21a2f --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56002.patch @@ -0,0 +1,147 @@ +From b4389e0b1d84a690b819bb27b1439968811a3674 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 1 Jun 2026 16:48:40 +1000 +Subject: [PATCH] pcfread: validate bitmap sizes and offsets against per-glyph + metrics + +pcfReadFont() uses bitmapSizes[] read directly from the PCF file to +allocate the repadded bitmap buffer. However, per-glyph metrics (also +from the file) control how much data RepadBitmap() writes. A malicious +PCF font can declare a small bitmapSizes[] value while having per-glyph +metrics that require more space, causing a heap buffer overflow. + +A similar issue happens with the encoding offsets: pcfReadFont reads +encoding offsets from the PCF file and uses them to index into the +metrics array without bounds checking. A crafted font can set an +encoding offset larger than nmetrics, causing an out-of-bounds pointer +that is later dereferenced when glyphs are accessed through the encoding +table. + +And the no-repad bitmap path (when PCF_GLYPH_PAD matches the requested +glyph pad) only validated that each glyph's offset was within the bitmap +buffer, but did not check that the full glyph extent (offset + +BYTES_PER_ROW * height) fits within the buffer. A crafted font with a +glyph offset near the end of a small bitmap buffer but large glyph +metrics causes a heap buffer over-read when the glyph is later rendered. + +This vulnerability was discovered by: + Anonymous working with TrendAI Zero Day Initiative + +CVE-2026-56002/ZDI-CAN-30559 + +Assisted-by: Claude:claude-opus-4-6 +Signed-off-by: Peter Hutterer +Part-of: + +Upstream-Status: Backport [import from debian libxfont1 1.5.2-4+deb9u1 +Upstream commit https://gitlab.freedesktop.org/xorg/lib/libxfont/-/commit/b4389e0b1d84a690b819bb27b1439968811a3674] +CVE: CVE-2026-56002 +Signed-off-by: Vijay Anusuri +--- + src/bitmap/pcfread.c | 60 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 57 insertions(+), 3 deletions(-) + +diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c +index 4a372c5..0cc9777 100644 +--- a/src/bitmap/pcfread.c ++++ b/src/bitmap/pcfread.c +@@ -45,6 +45,7 @@ from The Open Group. + #include + #include + #include ++#include + + void + pcfError(const char* message, ...) +@@ -529,25 +530,74 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, + int old, + new; + xCharInfo *metric; ++ int srcPad = PCF_GLYPH_PAD(format); + +- sizepadbitmaps = bitmapSizes[PCF_SIZE_TO_INDEX(glyph)]; +- padbitmaps = malloc(sizepadbitmaps); ++ /* Compute the actual required size from per-glyph metrics instead ++ * of trusting the file's bitmapSizes[] value, which may be smaller ++ * than the actual data written by RepadBitmap. */ ++ sizepadbitmaps = 0; ++ for (i = 0; i < nbitmaps; i++) { ++ int w, h, glyphBytes; ++ metric = &metrics[i].metrics; ++ w = metric->rightSideBearing - metric->leftSideBearing; ++ h = metric->ascent + metric->descent; ++ glyphBytes = BYTES_PER_ROW(w, glyph) * h; ++ if (glyphBytes < 0 || (glyphBytes > 0 && sizepadbitmaps > INT_MAX - glyphBytes)) { ++ pcfError("pcfReadFont(): bitmap size overflow\n"); ++ goto Bail; ++ } ++ sizepadbitmaps += glyphBytes; ++ } ++ padbitmaps = malloc(sizepadbitmaps ? sizepadbitmaps : 1); + if (!padbitmaps) { + pcfError("pcfReadFont(): Couldn't allocate padbitmaps (%d)\n", sizepadbitmaps); + goto Bail; + } + new = 0; + for (i = 0; i < nbitmaps; i++) { ++ int srcGlyphBytes; ++ + old = offsets[i]; + metric = &metrics[i].metrics; ++ ++ /* Validate source offset and source glyph size against the ++ * source bitmap buffer to prevent out-of-bounds reads. */ ++ srcGlyphBytes = BYTES_PER_ROW( ++ metric->rightSideBearing - metric->leftSideBearing, ++ srcPad) * (metric->ascent + metric->descent); ++ if (old < 0 || old > sizebitmaps || ++ srcGlyphBytes < 0 || srcGlyphBytes > sizebitmaps - old) { ++ pcfError("pcfReadFont(): bitmap offset/size out of bounds\n"); ++ free(padbitmaps); ++ goto Bail; ++ } ++ + offsets[i] = new; + new += RepadBitmap(bitmaps + old, padbitmaps + new, +- PCF_GLYPH_PAD(format), glyph, ++ srcPad, glyph, + metric->rightSideBearing - metric->leftSideBearing, + metric->ascent + metric->descent); + } + free(bitmaps); + bitmaps = padbitmaps; ++ } else { ++ /* Validate offsets and full glyph extents against bitmap buffer */ ++ for (i = 0; i < nbitmaps; i++) { ++ int glyphBytes; ++ xCharInfo *metric = &metrics[i].metrics; ++ ++ glyphBytes = BYTES_PER_ROW( ++ metric->rightSideBearing - metric->leftSideBearing, ++ glyph) * (metric->ascent + metric->descent); ++ if (offsets[i] >= (CARD32)sizebitmaps || ++ glyphBytes < 0 || ++ glyphBytes > sizebitmaps - (int)offsets[i]) { ++ pcfError("pcfReadFont(): bitmap offset/size out of bounds " ++ "(offset %u, size %d, total %d)\n", ++ offsets[i], glyphBytes, sizebitmaps); ++ goto Bail; ++ } ++ } + } + for (i = 0; i < nbitmaps; i++) + metrics[i].bits = bitmaps + offsets[i]; +@@ -622,6 +672,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, + if (IS_EOF(file)) goto Bail; + if (encodingOffset == 0xFFFF) { + pFont->info.allExist = FALSE; ++ } else if (encodingOffset >= nmetrics) { ++ pcfError("pcfReadFont(): encoding offset %d out of range (nmetrics=%d)\n", ++ encodingOffset, nmetrics); ++ goto Bail; + } else { + if(!encoding[SEGMENT_MAJOR(i)]) { + encoding[SEGMENT_MAJOR(i)]= +-- +2.43.0 + diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 59c489b785..08c96fdac8 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -20,6 +20,7 @@ XORG_EXT = "tar.bz2" BBCLASSEXTEND = "native" SRC_URI += "file://CVE-2026-56001.patch \ + file://CVE-2026-56002.patch \ " SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242" From patchwork Mon Aug 24 06:49:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Anusuri X-Patchwork-Id: 96132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1D54C5DF94 for ; Mon, 24 Aug 2026 06:50:14 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11021.1787554205554294378 for ; Sun, 23 Aug 2026 23:50:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@mvista.com header.s=google header.b=XiHQrztA; spf=pass (domain: mvista.com, ip: 209.85.215.177, mailfrom: vanusuri@mvista.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-ca80d708489so1980932a12.1 for ; Sun, 23 Aug 2026 23:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista.com; s=google; t=1787554205; x=1788159005; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KfbAPIjNfsIhPeDmShubKQoSzGJPWF3c5R9YFuAaFqU=; b=XiHQrztArgDWJElzaRWKnBOzIU/j/H5cG3kNHVxPsMH3hT2KeSlQDbspAi2kpDG0Lx cIJmgs6czwqNjDX/TuMIolAD3WclyqEbNXOhrGb6zjemFPiX9YrfzlPnDTo0Ii/mMyzT OWr/fQuQp8siJ8tRD41qZGS5FK/41BfwGgV/0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787554205; x=1788159005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=KfbAPIjNfsIhPeDmShubKQoSzGJPWF3c5R9YFuAaFqU=; b=CtfNyf6bWAANa9AqJlwHvuEl2KyaW/ctNui+3W+dNdcQ4yRS8cQSn1AVHaksT0hH12 xWw5ZZRL1b87orlkfRPNdj+jIkZeLWMO7bRsnlJk7aVCpBaBciplqltSGyWIYOUWQX9u zr6OpYxevmZ4PlechTdPS8Y2q41ot3vZlBJS7RfIHDBwVFAdlOXmOjVzbhqLMl3CAs6i kYNinIiOWDnUoVfw5R6vZEfT640sUWNT3QJfer05gXbUp2oOSt0rXTH83qyoMCp0LR8i WoKwIXUf+GIyCEBVx/pPglqitsc1EKK4b/O2HjVcl3yJDxohRp2jqUygydXxi87EinUc fW0Q== X-Gm-Message-State: AFuF++nmlUhQJswYHcK/7sCU7yFL4cP+ITrP0ohI/xtgkK8/CNWz+spX 6gKbw7HqX/ig86qycgmgJxB4pnKAJXj+8OS9kvYF/84NCYPDz51TS1cY06HxUL/UrGElPMoRIdu V/v3R X-Gm-Gg: AR+sD12+4fL1Bjr26hEVAR4DQVucPpDB0Td9EHizqDVIJqtnkGhgnhCHOQ9Kxnns0EN aoqRcYR77IR8jx3Wa8Gg6/cEPEHxbVVomPVx3JcjBI0qVauynf6MzMKxmUHz8b2ZlmMXhFBlwjg lVDByQiHP3jqWluOwzs6QpLD7Hwmhardg2vl9w5uMK8U1AE3qtxGFDpTJb1SZSC4bQkYlKFxbo4 OW6zyboPumeT0bdAWJlPw7J900/TEetQBt9D0lE5Wrj1SFiACDsPS6jGuGufIOdYe4ikI9+AixZ 1q4BrjxGKSn/QwgjWsLMKULAD2A5zdRP9zH4LK1GUy28RKMQ57+jUWngws6kkYdZpJeC9tPClGV KCJhNcR0k35J2CqGPzZm3myhZSxZqYGDA44yRkk6xoNsxDKbCLi3ufmx463tTYuaj1DW3pC8Z3v Aw9OpZyF2KGV2dl6o6Kod2uAH4q5mknMKzpGfasub2+uzTkxK6IF5D1JqTRCDYifBP6xUoW/Q1T KEQtZXOEzcbwiY= X-Received: by 2002:a17:90b:2646:b0:369:7491:7b24 with SMTP id 98e67ed59e1d1-395a04e6e66mr38128980a91.6.1787554204676; Sun, 23 Aug 2026 23:50:04 -0700 (PDT) Received: from MVIN00352.local ([182.74.28.237]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-141860ef75esm21780215c88.7.2026.08.23.23.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2026 23:50:03 -0700 (PDT) From: Vijay Anusuri To: openembedded-core@lists.openembedded.org Cc: Vijay Anusuri Subject: [OE-core][wrynose][patch 3/3] libxfont: Fix CVE-2026-56003 Date: Mon, 24 Aug 2026 12:19:44 +0530 Message-ID: <20260824064944.29802-3-vanusuri@mvista.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260824064944.29802-1-vanusuri@mvista.com> References: <20260824064944.29802-1-vanusuri@mvista.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Aug 2026 06:50:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244068 Pick patch according to [2] [1] https://nvd.nist.gov/vuln/detail/CVE-2026-56003 [2] https://security-tracker.debian.org/tracker/CVE-2026-56003 Signed-off-by: Vijay Anusuri --- .../xorg-lib/libxfont/CVE-2026-56003.patch | 115 ++++++++++++++++++ .../xorg-lib/libxfont_1.5.4.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56003.patch diff --git a/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56003.patch b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56003.patch new file mode 100644 index 0000000000..4a9a72e152 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxfont/CVE-2026-56003.patch @@ -0,0 +1,115 @@ +From dff957a5158da038a282a59a31fe736702732939 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 1 Jun 2026 16:49:55 +1000 +Subject: [PATCH] bitscale: add bounds check to computeProps for property + buffer + +ComputeScaledProperties allocates a fixed-size property buffer of 70 +slots. computeProps iterates the source font's properties and writes 1 +slot for unscaled properties or 2 slots for scaledX/scaledY properties, +with no bounds check. A malicious font with many duplicate properties +matching fontPropTable entries can overflow the allocated buffer. + +Fix this by passing the remaining buffer capacity to computeProps and +checking it before each write. Properties that would exceed the buffer +are silently skipped. + +The function is also restructured to handle the buffer writes for +scaledX/scaledY inside the switch cases directly, rather than in a +separate block after the switch. This makes the control flow clearer and +ensures the bounds check covers all writes. + +This vulnerability was discovered by: +Anonymous working with TrendAI Zero Day Initiative + +CVE-2026-56003/ZDI-CAN-30560 + +Assisted-by: Claude:claude-opus-4-6 +Signed-off-by: Peter Hutterer +Part-of: + +Upstream-Status: Backport [import from debian libxfont1 1.5.2-4+deb9u1 +Upstream commit https://gitlab.freedesktop.org/xorg/lib/libxfont/-/commit/dff957a5158da038a282a59a31fe736702732939] +CVE: CVE-2026-56003 +Signed-off-by: Vijay Anusuri +--- + src/bitmap/bitscale.c | 39 ++++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c +index c87fa96..012b207 100644 +--- a/src/bitmap/bitscale.c ++++ b/src/bitmap/bitscale.c +@@ -513,7 +513,8 @@ static int + computeProps(FontPropPtr pf, char *wasStringProp, + FontPropPtr npf, char *isStringProp, + unsigned int nprops, double xfactor, double yfactor, +- double sXfactor, double sYfactor) ++ double sXfactor, double sYfactor, ++ int maxprops) + { + int n; + int count; +@@ -528,14 +529,26 @@ computeProps(FontPropPtr pf, char *wasStringProp, + + switch (t->type) { + case scaledX: +- npf->value = doround(xfactor * (double)pf->value); +- rawfactor = sXfactor; +- break; + case scaledY: +- npf->value = doround(yfactor * (double)pf->value); +- rawfactor = sYfactor; ++ if (count + 2 > maxprops) ++ continue; ++ npf->value = (t->type == scaledX) ++ ? doround(xfactor * (double)pf->value) ++ : doround(yfactor * (double)pf->value); ++ rawfactor = (t->type == scaledX) ? sXfactor : sYfactor; ++ npf->name = pf->name; ++ npf++; ++ count++; ++ npf->value = doround(rawfactor * (double)pf->value); ++ npf->name = rawFontPropTable[t - fontPropTable].atom; ++ npf++; ++ count++; ++ *isStringProp++ = *wasStringProp; ++ *isStringProp++ = *wasStringProp; + break; + case unscaled: ++ if (count + 1 > maxprops) ++ continue; + npf->value = pf->value; + npf->name = pf->name; + npf++; +@@ -545,18 +558,6 @@ computeProps(FontPropPtr pf, char *wasStringProp, + default: + break; + } +- if (t->type != unscaled) +- { +- npf->name = pf->name; +- npf++; +- count++; +- npf->value = doround(rawfactor * (double)pf->value); +- npf->name = rawFontPropTable[t - fontPropTable].atom; +- npf++; +- count++; +- *isStringProp++ = *wasStringProp; +- *isStringProp++ = *wasStringProp; +- } + } + return count; + } +@@ -671,7 +672,7 @@ ComputeScaledProperties(FontInfoPtr sourceFontInfo, /* the font to be scaled */ + n = NPROPS; + n += computeProps(sourceFontInfo->props, sourceFontInfo->isStringProp, + fp, isStringProp, sourceFontInfo->nprops, dx, dy, +- sdx, sdy); ++ sdx, sdy, nProps - NPROPS); + return n; + } + +-- +2.43.0 + diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 08c96fdac8..e254516fcf 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -21,6 +21,7 @@ BBCLASSEXTEND = "native" SRC_URI += "file://CVE-2026-56001.patch \ file://CVE-2026-56002.patch \ + file://CVE-2026-56003.patch \ " SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242"