From patchwork Mon Feb 19 20:44:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1901129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=XDhVDBRH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tdvgd4SBrz1yP6 for ; Tue, 20 Feb 2024 07:45:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BDB03858415 for ; Mon, 19 Feb 2024 20:45:30 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 509F23858D33 for ; Mon, 19 Feb 2024 20:45:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 509F23858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 509F23858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::434 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375510; cv=none; b=vDbYpuMYHrz5CWjeAjSXrR3CYWEtKGwb2jNdpdrlZWzV2dm8tq1rrFYr8MJkVdhzVNGwg+u6z1fWL80rflQNTcsr+3qjd8VkGQLRQArKW9k4n4tjZ6MWKNtE6V9uLYNdj4HmnLCBXo0Zq47kl9M2sVSbKB4jGRhYA5+7S3OqV9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375510; c=relaxed/simple; bh=uqvfVLtdD5bXL9H6HdqjhKefaZdqfIs1q4CtTAIA6lk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ksgaabtIuhqbJ9474NSgtM2DljuFX6VcDHIfsGpGmZpYwByJL6Ykh83ztzlmJT51FShpaTr2yqYS0WvARmZf38vXnzYSIOgoVIzbUlrCVLupeq7WeTILw8Y87eJc9/+KtTuebjG7SuQI+JBzitUys4xbgy4cg//rMmc07yrBhf4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6e435542d41so687821b3a.1 for ; Mon, 19 Feb 2024 12:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708375506; x=1708980306; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Jezt0HhRPMVcKHjhrdTqkz8djR54JIEGT+ebU0253K0=; b=XDhVDBRHrFKBGEDxAgJa4z219jiKN9jPJTGGikZA5QB6e/HJf5VLhiIk1L04oD3km3 MtfWkQFg40h2zAyG/Dw6SCh3FNVsdd9WEq3tQ32geeHdxSakTTX5yq6kKL92J5hYl2uS eV5yklrL/+2aU9EQj/5L5wDy9qu2/ndQg7RiYuDiQN3pwxMb7H1Ir3yDL2T6kts/UQVJ +1d4Ecax8+kazkZhBmtAUFOvKedL2IgTj89ta+F/hhiNjT/EZHNtSZUNEJkr6/pS/n0c DNc3Oz4ij4GJDYvJjw4fNvI2nVhYsF2NE0r+Dri6G91X+HWvRvAMbtGrcOHcafpcemnV qfLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708375506; x=1708980306; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Jezt0HhRPMVcKHjhrdTqkz8djR54JIEGT+ebU0253K0=; b=S4Pa1I1oJzEkbufDSC7zKkV4Eyo8UDNGyyzlDTxZrBl+V4jT4HhvopUthNh2o/D9zH yVmesykdwsKWC/eUP4FhPeq6PQeLTCP+W7gIlSj/9rsqtqhzOZIO1sQCCcGuRUl+4Ae9 AvlR3jjSj59k6g+Wo4PfipReA6lN0ezStPf/gpK7j9hthucoTfqLWshZpzEj9t2ip0e8 2Vdk54IY8tddv8jRXk3NhDx4z+MHzj2Djj81PjgSwJevLX32uPvrCgHn2/BtdxEcpGxt WICti3Gb1vosLdXQJsA1ndIFWxK0oUyFWJR9iLmMh+uJwjIlNrB4TOh3mgWQnuT5z5RG a5mg== X-Gm-Message-State: AOJu0YyzJvSxudg0TXC0qhy8u9lNxSdYBJ3YbYy47YYcZMtH8Xdhg3gQ 9ygrci0X9rNAfnO1IbDj6F1Srr6/ber/Dgi/Ru169/E24/J4X6k3PFNsweCFRn2OtJHsr3NddV5 H X-Google-Smtp-Source: AGHT+IEUuLZuOW7INcS+oFJhbqjbKjENQQekm5fe5UX2tOn4e8yMwCXewwy1yMGKX6bGQqm6irZSbg== X-Received: by 2002:a05:6a20:2c81:b0:19e:b888:8a1e with SMTP id g1-20020a056a202c8100b0019eb8888a1emr9210369pzj.24.1708375506633; Mon, 19 Feb 2024 12:45:06 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:8177:87f4:ac6d:3153:10b3]) by smtp.gmail.com with ESMTPSA id i28-20020a056a00005c00b006e37bedbcbdsm4369802pfk.115.2024.02.19.12.45.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:45:05 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 0/3] Improve wcsstr Date: Mon, 19 Feb 2024 17:44:59 -0300 Message-Id: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.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+incoming=patchwork.ozlabs.org@sourceware.org Different than strstr, wcsstr still uses an O(m*n) algorithm that might be considered a security issue (although BZ 23865 was marked security- since there is no actual application impact). The gnulib recently added a wrapper to fix it [1] and it is used as the base de str-two-way.h implementation. This patch adds a similar implementation, and different than strstr, neither the "shift table" optimization nor the self-adapting filtering check is used because it would result in a too-large shift table (and it also simplifies the implementation bit). The patchset also added a proper tests for wcsstr, based on strstr one. [1] https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=9411c5e467cf60f6295b9fed306029f341a0f24f Adhemerval Zanella (3): string: Remove c_strstr from test-strstr wcsmbs: Add test-wcsstr wcsmbs: Ensure wcstr worst-case linear execution time (BZ 23865) string/test-strstr.c | 131 ++++++++++-------- wcsmbs/Makefile | 1 + wcsmbs/test-wcsstr.c | 20 +++ wcsmbs/wcs-two-way.h | 312 +++++++++++++++++++++++++++++++++++++++++++ wcsmbs/wcsstr.c | 104 +++++---------- 5 files changed, 444 insertions(+), 124 deletions(-) create mode 100644 wcsmbs/test-wcsstr.c create mode 100644 wcsmbs/wcs-two-way.h