From patchwork Tue Sep 29 13:58:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 144865 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 5D40F4BB3B99 for ; Tue, 29 Sep 2026 13:59:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D40F4BB3B99 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=G/6V0HUv; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=42K3Cyu1; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LOtlO9i+; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=n5PUg5Bp X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id A39C14BA2E31 for ; Tue, 29 Sep 2026 13:59:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A39C14BA2E31 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A39C14BA2E31 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790690341; cv=none; b=HPcvAlwWLS7+XI65bl3GsY+YqEIp8HEIm6IqV3XLw9njgncOIJjQt1sMzEiTlEPLCvrUL3DocO3PzrmJM5PW+Hw8VLEHybckV6W7Dxygh8aonpLNEh1sBrTxu7kXRAdgHtbzXLvhweRNOeIBUOapBmYVk/sg4oqg79u7HKeVbmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790690341; c=relaxed/simple; bh=rexI59EAO/OR4j2Hxplb9SUot+jofh/fe8+JKk7rPiI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=evfMEvJ9pVjABG4TkdswbVQYj9rwefUOw/QzzgpQQvHLOo5XE8XEF7rerfy88yVbobHd45CbBLs9l1DYlfBUGIExtqRsrAnEZTakSpoXjlPfUcLX2cz/Qf5Ad5GJGR1C25RK5yZ408FX7scXzm6Nr3qy3BBNj7lp9l0QqZnkk7c= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=G/6V0HUv; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=42K3Cyu1; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LOtlO9i+; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=n5PUg5Bp DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A39C14BA2E31 Received: from hawking.suse.de (unknown [IPv6:2a07:de40:a101:3:92b1:1cff:fe69:ddc]) by smtp-out1.suse.de (Postfix) with ESMTP id 7C60E21CDC for ; Tue, 29 Sep 2026 13:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790690336; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=kN+4PJNuNT1ZSP/Ud+fleL6FJ0LnaVw1ch8nJJKG2Nw=; b=G/6V0HUvbTxl/tfnZlLaBa0ZOb89iSkD1buH80m5KMjkknVE9fddBErxg+Di7PIEngN4lh Ua+yXs8emPwyxtdUb6lx+dSAdJDc17FSYXCfbJaMsoKERilICaEcCZ9SvcXC9SyjtuXgQy cwoHhppDtn7FqQnvGLJX2rKM0vIP0x4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790690336; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=kN+4PJNuNT1ZSP/Ud+fleL6FJ0LnaVw1ch8nJJKG2Nw=; b=42K3Cyu1FXnoa0IXdukh8LS04oAzySJ27fVn10SpEZan/D3qiqyIGcd4VxqxHIH3HEt3BO Kd72mKayRCjHmKAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LOtlO9i+; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=n5PUg5Bp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790690332; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=kN+4PJNuNT1ZSP/Ud+fleL6FJ0LnaVw1ch8nJJKG2Nw=; b=LOtlO9i+XWOzJysMhGc5am6SO3rpbBnNEnl0oaeqNNy70wLwab2nUbwgpna+Ee/tE4Fu6z jieLmNQiyidYa5ftYp85E2Zig69oKHYmAi/6L5J5SNMPm/dsuKdmdcxwhAQiyUu5DS/Njy o3m2ypU05/LlFJ9GAa0559IpRsJfABs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790690332; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=kN+4PJNuNT1ZSP/Ud+fleL6FJ0LnaVw1ch8nJJKG2Nw=; b=n5PUg5BpbzRcPBhLmBy6MxdaWxyD8rnSQ7AQI94p+6zfVZi1TGxBn+y1GElNSZAS+jpHKj OzQ+TNfZS23eaABA== Received: by hawking.suse.de (Postfix, from userid 17005) id 6B9FA4AAD8E; Tue, 29 Sep 2026 15:58:52 +0200 (CEST) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] power8: fix read past array bounds in strncasecmp (bug 34683) Date: Tue, 29 Sep 2026 15:58:52 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [15.28 / 50.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM_LONG(3.50)[1.000]; BAYES_HAM(-3.00)[99.99%]; NEURAL_SPAM_SHORT(2.99)[0.998]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.suse.de]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.suse.de]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:a101:3:92b1:1cff:fe69:ddc:from]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,suse.de:dkim] X-Spamd-Bar: +++++++++++++++ X-Rspamd-Queue-Id: 7C60E21CDC X-Spam-Score: 15.28 X-Rspamd-Action: add header X-Spam: Yes X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Move the load of the characters to the top of the loops, so that they occur after the bounds check for the strncasecmp implementation. Amend the page test for strncasecmp to also test with non-null-terminated arrays that trigger this bug. --- string/test-strncasecmp.c | 16 ++++++++++++++++ sysdeps/powerpc/powerpc64/power8/strcasecmp.S | 14 ++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c index 6b00113e66..3fced4202b 100644 --- a/string/test-strncasecmp.c +++ b/string/test-strncasecmp.c @@ -199,6 +199,22 @@ do_page_tests (void) exp_result); } } + + /* Like strncmp, the arrays passed to strncasecmp are not required to be + null-terminated. Check that the implementations do not read beyond + the end of the arrays. */ + + s1[maxoffset - 1] = 'a'; + s2[maxoffset - 1] = 'a'; + for (size_t off1 = 0; off1 < maxoffset; off1++) + { + for (size_t off2 = 0; off2 < maxoffset; off2++) + { + size_t off_max = off1 < off2 ? off2 : off1; + FOR_EACH_IMPL (impl, 0) + check_result (impl, s1 + off1, s2 + off2, maxoffset - off_max, 0); + } + } } static void diff --git a/sysdeps/powerpc/powerpc64/power8/strcasecmp.S b/sysdeps/powerpc/powerpc64/power8/strcasecmp.S index 3c45e9ea50..22db297855 100644 --- a/sysdeps/powerpc/powerpc64/power8/strcasecmp.S +++ b/sysdeps/powerpc/powerpc64/power8/strcasecmp.S @@ -355,8 +355,6 @@ L(bytebybyte): offset and string descriptors are only updated in the end of loop unrolling. */ ld rLOC, LOCALE_CTYPE_TOLOWER(rLOC) - lbz rCHAR1, 0(rSTR1) /* Load char from s1 */ - lbz rCHAR2, 0(rSTR2) /* Load char from s2 */ #ifdef USE_AS_STRNCASECMP rldicl rTMP, r5, 62, 2 cmpdi cr7, rTMP, 0 @@ -364,6 +362,8 @@ L(bytebybyte): mtctr rTMP #endif L(loop): + lbz rCHAR1, 0(rSTR1) /* Load char from s1 */ + lbz rCHAR2, 0(rSTR2) /* Load char from s2 */ cmpdi rCHAR1, 0 /* *s1 == '\0' ? */ sldi rADDR1, rCHAR1, 2 /* Calculate address for tolower(*s1) */ sldi rADDR2, rCHAR2, 2 /* Calculate address for tolower(*s2) */ @@ -404,13 +404,11 @@ L(loop): lwzx rLWR2, rLOC, rADDR2 cmpw cr1, rLWR1, rLWR2 crorc 4*cr1+eq,eq,4*cr1+eq - beq cr1, L(done) - lbz rCHAR1, 0(rSTR1) /* Load char from s1 */ - lbz rCHAR2, 0(rSTR2) /* Load char from s2 */ #ifdef USE_AS_STRNCASECMP + beq cr1, L(done) bdnz L(loop) #else - b L(loop) + bne cr1, L(loop) #endif #ifdef USE_AS_STRNCASECMP L(lessthan4): @@ -419,6 +417,8 @@ L(lessthan4): beq cr7, L(retnull) mtctr r5 L(loop1): + lbz rCHAR1, 0(rSTR1) + lbz rCHAR2, 0(rSTR2) cmpdi rCHAR1, 0 sldi rADDR1, rCHAR1, 2 sldi rADDR2, rCHAR2, 2 @@ -429,8 +429,6 @@ L(loop1): beq cr1, L(done) addi rSTR1, rSTR1, 1 addi rSTR2, rSTR2, 1 - lbz rCHAR1, 0(rSTR1) - lbz rCHAR2, 0(rSTR2) bdnz L(loop1) #endif L(done):