From patchwork Wed Sep 30 19:36:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Tolmatcev X-Patchwork-Id: 145054 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B99354BB1C2A for ; Wed, 30 Sep 2026 19:38:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B99354BB1C2A Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=YT89rg5Q X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm2-x10.google.com (mail-wm2-x10.google.com [IPv6:2a00:1450:4864:31::10]) by sourceware.org (Postfix) with ESMTPS id D824A4BB24FD for ; Wed, 30 Sep 2026 19:37:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D824A4BB24FD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D824A4BB24FD Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:31::10 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790797074; cv=none; b=fhm8bWwANWzaKljW9+x8XhQMqa9z9DwI79fgBR619aQ7bIOuQkwGdpacguuKSxIM7urX2BMqisEBOshE/MnywuP7Gj+Zl6LPeblkiBptu2akxgNnT3JSm4+nzYn9LgBWZ4fYX5Rocc/cJ4HGiwIcS5OWLKSqudm1gtn/4lPonCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790797074; c=relaxed/simple; bh=f0a7gbXYC9fzc0cPoZd0nuv+n7jXLG9YGJKFUkpoH8Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AEpDy3Z3VkCm3vXr1o4NCEKB3+Sg8Y6kOSt5QW/RHHvb9rYHl4KDNKgN0Jtzi9OCgb4hTrQuMUObhfH0e5y2RbsIKrQkavvA3r1Oy4wJ4n5bJ1BxGBSMS/FqAzcG2irSdPUZ+WVaIHk6sOJzTGn4Q0NBXpgA9U/FCwjfM+6BYqw= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=YT89rg5Q DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D824A4BB24FD Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-4a006bb267eso20151505e9.0 for ; Wed, 30 Sep 2026 12:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790797073; x=1791401873; darn=sourceware.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=MYHQ6o9CDW9SEG9IHX0rBEDq956XdVXP6IkLxHGfPAk=; b=YT89rg5QyNlcOZheuIu3I/6UGdxo4H+mFyzKPXsGUKXPN/zDVNkurEvbFM/OEWWTcv IJQnuohpEBbLCS9fbJGqHF1KOOXmcbA8bo77KGCOz8nBtHzTMY6zB/Fj3f/7KTP0sB0k eruv/8fJwnus7xyD4r5X3zFT6E1AGgfCTftJslwJBPELVZLsYEhYRcOIY1Af6wlSV8ir 7mRgcJJMlRrbyt7WQ5mTgupg6fEdsCJxaxKBVgRyb5w4n1/SfjDhiYzUPQmmJA7Ct1MV xCsVTMbx7Qa0ADvvTBaWbH1vs5iY37jgiZjfScTWKM5SHPlU8G/td15VnUreWU3a8Bvv Q0Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790797073; x=1791401873; 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=MYHQ6o9CDW9SEG9IHX0rBEDq956XdVXP6IkLxHGfPAk=; b=ptNuuJH1+nMBWJI0GFwXUwT3rimUk0liIKotFgb5DMVBqJ0BTESSHfSIgK5a2hBPl9 tX83cgFwpwuAj2J3M4qNSkOqpt4vspPBOFhUZ/sFPrLMoZRTijPfhh1NzgiwqIn2mqv0 Qh+YOhD9lIoWGMwNDqbziR5OMN802MIVrW2GpvSHa8ld4itqq3n4X9vZhatHcUDhb4QV xfU4qlDCIMjq+gSg/YxOwbDfFumIcsGUzdpNd2WU0PiIzVLMAcPaLpNGeAc858hKBqta twHMFbvH0ev8nVqrg2hp0+3zMbLHY1+shrfZaGAgUK2/9NQ5AYrBOggHriBBY5SC0QZL NxdQ== X-Gm-Message-State: AFuF++nayGR7mWYQtTjtO2FaFr+NCzGces/81oi9cBkcp5+HuhTJv7oa BmJlX6krUAqpMJti6pMIqyvj8TZ5sXl2fQyS4OLfb2zPI2AJ/VIZwrtvG/F1zg== X-Gm-Gg: AYBFou2kNPtg4FdsHp+wB45H2leudWL0rE+CbYb56UoQT7nHA+u0gTy/jaCtU65CVqY cM3ptZ8N+DIXFNcJ0Ts+R92m8sTMCls0YL5910lNZGy3/5hzDpd2g62SBqiXg/alhSmaT9YbwEX u7i5QbvTjFbLZGK9m4WrduMOtaFnfiW3Vo0ti5xxtWrjRREFqYloTxxXKSLpVYk4lfCuzpNZOf7 yoUDlgHkLYnqFOEW1HKLc3LsdE0o+4WXu8zVKvVSrtjGZQezFOT9r4mhfMTZIab0UamQLBcUikm U69DBgTgKzmcApkODGxyWLyhNai9exFte56jIcWSOc/tkAhEh+iqCeMLGN/kkiwEREK5MerstPq x6y5lv6kMuQi9khsCvjEuiICZZS3+3zw2CGOFMSuGFywoCUDK+Z0q2IAxIeN/chUjINXNu/rEN2 HXEhJTL9lmWDSk2iy1zOgx3k+6Zuvnv6rfa7h+gEG2pPDDsONdDCEysDABI0dthcxM9VueWgCDo oSrvtBTfCWC0MBPFhnt4fWr3zYPmQ4ZeZ8mVHlGqLBMo7U1Rsg+TTLsrwKBOq0iNQ0= X-Received: by 2002:a05:600c:4fd5:b0:49f:fed0:fc47 with SMTP id 5b1f17b1804b1-4a01ad90a51mr41418825e9.1.1790797072531; Wed, 30 Sep 2026 12:37:52 -0700 (PDT) Received: from Mein-PC (p200300ed8f0406002186408458360e23.dip0.t-ipconnect.de. [2003:ed:8f04:600:2186:4084:5836:e23]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a01f979c05sm8518815e9.3.2026.09.30.12.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2026 12:37:52 -0700 (PDT) From: Oleg Tolmatcev To: binutils@sourceware.org Cc: Oleg Tolmatcev Subject: [PATCH] ld/pdb: Fix PDB source-info substream overflow Date: Wed, 30 Sep 2026 21:36:57 +0200 Message-ID: <20260930193657.733-8-oleg.tolmatcev@gmail.com> X-Mailer: git-send-email 2.56.0.windows.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_PBL, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org source_files_count counts every source file reference across all modules, not the deduplicated count that goes into the substream header, so a uint16_t is too narrow. A link with more than 65535 references wraps it, allocates too small a buffer for the source-info substream, and then writes past the end of it. ld/ * pdb.c (create_source_info_substream): Make source_files_count a uint32_t. * testsuite/ld-pe/pdb4a.s: New test source. * testsuite/ld-pe/pdb4b.s: New test source. * testsuite/ld-pe/pdb.exp (test11): Run the new test. --- ld/pdb.c | 2 +- ld/testsuite/ld-pe/pdb.exp | 23 +++++++++++++++++++ ld/testsuite/ld-pe/pdb4a.s | 45 ++++++++++++++++++++++++++++++++++++++ ld/testsuite/ld-pe/pdb4b.s | 38 ++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-pe/pdb4a.s create mode 100644 ld/testsuite/ld-pe/pdb4b.s diff --git a/ld/pdb.c b/ld/pdb.c index 36b600e34bd..b349de94263 100644 --- a/ld/pdb.c +++ b/ld/pdb.c @@ -4359,7 +4359,7 @@ create_source_info_substream (void **data, uint32_t *size, struct source_files_info *source) { uint16_t dedupe_source_files_count = 0; - uint16_t source_files_count = 0; + uint32_t source_files_count = 0; uint32_t strings_len = 0; uint8_t *ptr; diff --git a/ld/testsuite/ld-pe/pdb.exp b/ld/testsuite/ld-pe/pdb.exp index 1439baa4bf8..48b0f517ec7 100644 --- a/ld/testsuite/ld-pe/pdb.exp +++ b/ld/testsuite/ld-pe/pdb.exp @@ -1837,6 +1837,28 @@ proc test10 { } { } } +# Check that a PDB file with more than 65535 source file references can be +# created. + +proc test11 { } { + global as + global ld + global srcdir + global subdir + + if { ![ld_assemble $as $srcdir/$subdir/pdb4a.s tmpdir/pdb4a.o] + || ![ld_assemble $as $srcdir/$subdir/pdb4b.s tmpdir/pdb4b.o] } { + unsupported "Build pdb4a.o and pdb4b.o" + return + } + + if ![ld_link $ld "tmpdir/pdb4.exe" "--pdb=tmpdir/pdb4.pdb -e main tmpdir/pdb4a.o tmpdir/pdb4b.o"] { + fail "Create PDB file with more than 65535 source file references" + } else { + pass "Create PDB file with more than 65535 source file references" + } +} + test1 test2 test3 @@ -1847,3 +1869,4 @@ test7 test8 test9 test10 +test11 diff --git a/ld/testsuite/ld-pe/pdb4a.s b/ld/testsuite/ld-pe/pdb4a.s new file mode 100644 index 00000000000..a066ae3e7a4 --- /dev/null +++ b/ld/testsuite/ld-pe/pdb4a.s @@ -0,0 +1,45 @@ +/* Two modules with 32768 source file references each, so that the total + number of references in the DBI source-info substream exceeds 65535. */ + +.equ CV_SIGNATURE_C13, 4 +.equ DEBUG_S_STRINGTABLE, 0xf3 +.equ DEBUG_S_FILECHKSMS, 0xf4 +.equ CHKSUM_TYPE_NONE, 0 + +.equ NUM_CHKSMS, 32768 + +.section ".debug$S", "rn" +.long CV_SIGNATURE_C13 +.long DEBUG_S_STRINGTABLE +.long .strings_end - .strings_start + +.strings_start: + +.asciz "" + +.src1: +.asciz "foo" + +.strings_end: + +.balign 4 + +.long DEBUG_S_FILECHKSMS +.long .chksms_end - .chksms_start + +.chksms_start: + +.rept NUM_CHKSMS +.long .src1 - .strings_start +.byte 0 /* checksum length */ +.byte CHKSUM_TYPE_NONE +.short 0 /* padding */ +.endr + +.chksms_end: + +.text + +.global main +main: + .long 0x12345678 diff --git a/ld/testsuite/ld-pe/pdb4b.s b/ld/testsuite/ld-pe/pdb4b.s new file mode 100644 index 00000000000..6040f7ec4ac --- /dev/null +++ b/ld/testsuite/ld-pe/pdb4b.s @@ -0,0 +1,38 @@ +/* See pdb4a.s. */ + +.equ CV_SIGNATURE_C13, 4 +.equ DEBUG_S_STRINGTABLE, 0xf3 +.equ DEBUG_S_FILECHKSMS, 0xf4 +.equ CHKSUM_TYPE_NONE, 0 + +.equ NUM_CHKSMS, 32768 + +.section ".debug$S", "rn" +.long CV_SIGNATURE_C13 +.long DEBUG_S_STRINGTABLE +.long .strings_end - .strings_start + +.strings_start: + +.asciz "" + +.src1: +.asciz "bar" + +.strings_end: + +.balign 4 + +.long DEBUG_S_FILECHKSMS +.long .chksms_end - .chksms_start + +.chksms_start: + +.rept NUM_CHKSMS +.long .src1 - .strings_start +.byte 0 /* checksum length */ +.byte CHKSUM_TYPE_NONE +.short 0 /* padding */ +.endr + +.chksms_end: