From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 06A833858C53 for ; Wed, 23 Aug 2023 01:37:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 06A833858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-68a40d85593so2101360b3a.2 for ; Tue, 22 Aug 2023 18:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692754643; x=1693359443; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=dwN9/wixHX86dTu00NsySbk3dyrpDqEbk1J/mPdAXUw=; b=jDmt+LHSn6iGhoCQJJ2z6svAv8j4bQDvX7vcr78xydc71bzVlcidCI47tp7JLKZz14 U6xgvBKCpkza0sUVRVrl91WugRYLLhbk6fuWD3ZmbxX4MezaTKy0LO6/PLO5HsqPsnzu oeH7dS+6TBKHAPoj0aXBG9tXlfKV1RN5Uo0FcvLQdhwspZ+8hHkM+Fv1XbObcRNGbLIy j863TOPQXV1dLpcZLIaphGTToORvwO85EokQmDwtbcqxRxlMNZ39xwMm0eMNd2jqp2hO R+3UkixJTgFXpeMAB/Lrx9Ci4ZNJ7ZEoKUfiwvIHM5BXJDk6jh6LdjdWuz2zoMbtmunt i7AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692754643; x=1693359443; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dwN9/wixHX86dTu00NsySbk3dyrpDqEbk1J/mPdAXUw=; b=GmBHg7W+wfbpTXeIfnzr1ZyBPHn6BnL9mmr0uGD+nE6vugqGZhsZVav+mmP5vk8p0N 508pDiv7a6VeqB5SfnO97Yrdepw9IAAaEBOEQ8OUOyNZQWY/9HM+kdAcp6mxLhuclEHu tzdUw84MNvQJ9UblXIAD3xbfZiGeDM9YtIy0q67jtMfZfLX/6oDoyci+fOUm5NIKT3dH vB0Yura61i+Xm+FBXAd4sEH8pB0kyY3K5vUgALTqBy3ZYBcXIDU0hfXWLLRg6g8+yD/x bFYLUZJIHqi8kxIa3Q+dGxr/tF6FJSx7/zSr4ifJybM9eV1avRyn/sCLGzpjgNlsXijA lrUA== X-Gm-Message-State: AOJu0YzGzX4V58nPM5Tcg1DhNNqmSxD0W2yymUUtrXiBuyQ4ZgUHz5Yw FYyFcdfYbqZW4TN7kcA+CfjSjUvW0QTlBA== X-Google-Smtp-Source: AGHT+IH62lHR3GHSJgwaFCSzl7u8zrM5aAiLC6a0vrXPNV40kVHQv9ceKIweYoDdZwuHvUcm7r8AtA== X-Received: by 2002:a05:6a00:2496:b0:68b:a137:373e with SMTP id c22-20020a056a00249600b0068ba137373emr2631198pfv.32.1692754643281; Tue, 22 Aug 2023 18:37:23 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:ead0:eed5:cfa5:cc5d]) by smtp.gmail.com with ESMTPSA id a18-20020a62bd12000000b00687dde8ae5dsm8239860pff.154.2023.08.22.18.37.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 18:37:22 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 120C911423E0; Wed, 23 Aug 2023 11:07:20 +0930 (ACST) Date: Wed, 23 Aug 2023 11:07:20 +0930 From: Alan Modra To: binutils@sourceware.org Subject: bfd_get_symbol_leading_char vs. "" Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3033.8 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,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Some places matching the first char of a string against bfd_get_symbol_leading_char, which may be zero, didn't check for the string being "". This patch adds the check to stop accesses past the end of the string and potential buffer overruns. The dlltool one was found by oss-fuzz quite a while ago. bfd/ * cofflink.c (_bfd_coff_link_input_bfd): Ensure a zero bfd_get_symbol_leading_char doesn't lead to accessing past the zero string terminator. * linker.c (bfd_wrapped_link_hash_lookup): Likewise. (unwrap_hash_lookup): Likewise. binutils/ * dlltool.c (scan_filtered_symbols): Ensure a zero bfd_get_symbol_leading_char doesn't lead to accessing past the zero string terminator. diff --git a/bfd/cofflink.c b/bfd/cofflink.c index aea5c4c38a5..221f6e8183a 100644 --- a/bfd/cofflink.c +++ b/bfd/cofflink.c @@ -1618,7 +1618,8 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd) /* Ignore fake names invented by compiler; treat them all as the same name. */ if (*name == '~' || *name == '.' || *name == '$' - || (*name == bfd_get_symbol_leading_char (input_bfd) + || (*name + && *name == bfd_get_symbol_leading_char (input_bfd) && (name[1] == '~' || name[1] == '.' || name[1] == '$'))) name = ""; diff --git a/bfd/linker.c b/bfd/linker.c index 0f4f9a1776c..28fffc3ad63 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -544,7 +544,9 @@ bfd_wrapped_link_hash_lookup (bfd *abfd, char prefix = '\0'; l = string; - if (*l == bfd_get_symbol_leading_char (abfd) || *l == info->wrap_char) + if (*l + && (*l == bfd_get_symbol_leading_char (abfd) + || *l == info->wrap_char)) { prefix = *l; ++l; @@ -621,8 +623,9 @@ unwrap_hash_lookup (struct bfd_link_info *info, { const char *l = h->root.string; - if (*l == bfd_get_symbol_leading_char (input_bfd) - || *l == info->wrap_char) + if (*l + && (*l == bfd_get_symbol_leading_char (input_bfd) + || *l == info->wrap_char)) ++l; if (startswith (l, WRAP)) diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 085d4c2ce41..6d63e11e084 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -1500,7 +1500,8 @@ scan_filtered_symbols (bfd *abfd, void *minisyms, long symcount, bfd_fatal (bfd_get_filename (abfd)); symbol_name = bfd_asymbol_name (sym); - if (bfd_get_symbol_leading_char (abfd) == symbol_name[0]) + if (*symbol_name + && *symbol_name == bfd_get_symbol_leading_char (abfd)) ++symbol_name; def_exports (xstrdup (symbol_name) , 0, -1, 0, 0, -- Alan Modra Australia Development Lab, IBM