From patchwork Fri May 15 13:35:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 135046 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 3A4C640A1FB4 for ; Fri, 15 May 2026 13:40:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A4C640A1FB4 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=Iu9cTdi/ X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 1DEED40A24B7 for ; Fri, 15 May 2026 13:35:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1DEED40A24B7 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1DEED40A24B7 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778852140; cv=none; b=PHy/DM7gtycqrOi6wybUzJ6lXHwilr9VtvPwswSGGCrusu/qe4hM/SKQ8W+vSIEUGmXY3vxr9AdF4ya3vzHg8xBoa7m+TVFn5JUIxFgdTeDWT7VskkXGgIWy9gHWJ/U+FM1n6Ux8Ljsrj8Bg6IJWaC178jC5tprh40Bvg4OX95I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778852140; c=relaxed/simple; bh=SgqixCdqRYa7gUBWWpoOVLfg1OAkn35dAfNHbE8rn/w=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=KtiNaz4J/jlb96tjiexom4L21N80BFWsDUAMTTeiuVfrS8Rth8pFvWrIwLwXlwQwfjIbKJlUowXYX5pMkTcbM8Ls14WItYA9wtdA39MrWWJJOjBKJDy8twuaas2/9P9EY0W+29OqgGy5ce5xT0BLWYxiv78GBZ62+UmMuzN6t9I= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=Iu9cTdi/ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DEED40A24B7 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43d77f6092eso5743904f8f.2 for ; Fri, 15 May 2026 06:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778852139; x=1779456939; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=yDYGU/3EK6LU9sH+z44nd567bF9RlL7PLVMbybYjyN0=; b=Iu9cTdi/7IczietXpkJJryM+EwjdEkVIF1+vB7OZtSEhEWHCCyB3Nh7Q707WbH4zNB z46Jj/+JdVUDiLaBZ9GM+qairmJMA+oid6vH3BshPu4WZXTyUeqDbj9yPLqFRc7avXtq zqXzdb/NARHtuccNFjI5HshvM/oOJoEdBhfZ+cpqPuJZMCmhlZWJrhC4+I+f3zB7odfe ICUdSzNUxS0xOgpQ+l2wcLUJaAKAL/VIadnmmIsIFgFcQmfv3Dlgij9kd9iOxhLQX1/6 W1A+FvIr1gnzTFEadja7WPJWnpfY06oNbB7Hj4ELNvVI9oxxcHCFr2s1a94R+RklRz3B Jp+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778852139; x=1779456939; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yDYGU/3EK6LU9sH+z44nd567bF9RlL7PLVMbybYjyN0=; b=cGiru6C8BP3JscVulcNePjwISDkhaKhDH+kZV8a7C2CK/EKq01SlJ1Pk1jwq6S082i JordT60EQ71NmoriKdoP0tLPedP3Nzyifsy+5dsNbHOZ136Ivl2A2XMC+63m/Jf76pR7 /VNGxQq+6Oq9UkJskykqkCPpB2qIMYxOt87C5W9QrIkH4U/1kCwcBS0pfYzmnxyLyBQw Bo4+99DSfarOWzmPnV0B5Eig4Axm13RSKkZOIDaITIBvNoNynZWUJUN4yxH57OTUZ4My lfhOP0Hje/NrkU0/JPhX8pPbrj6HhyrjUivnvVi9piiGEGpFUp9flWiyPbFndAt0x7Oa xh9w== X-Gm-Message-State: AOJu0YzfH17bkOrk65GzKD3qPSt+Lq9fBr2zMaDl8M8oVvePjB3SQJ6d Hr5psshoc1N0qc++mor+ZlTpUADFzQvXNlbSoVoOMXK9duvTrmIltA++SBvLvgkxU2cQwBIWSY8 q6GY= X-Gm-Gg: Acq92OEbiCSz05gKdy5KnPuFzuXGxPRdd7DlRvJgU/FhroKBXjyPKEnm6iQOsBmuLb0 PPzQP/Qwry1MdK1oaRvDrKoDNjW77y7pqxV7+YzjgHELcbyyjvf0dXzo/kQyqJhDdFGHQUp6axt 9/5VnBkoJHEoAJa/DNgr9ryM5IWfWJvfHU6jNqf56J/A2fCjWTj5cjbyy4IUaArJPmO4ATOxB8g xUjIXpLKNKJJeouKOD2B8/UtDaarPSWm+MOhMnfumMYSO5sE89ftu38vidkur6gR2+BH0POeLYe u88kCJHRhQND+2454TIhdLjjgygiVY/X3cVTIEYkhieQPw3Bvv68HjeQwCH9I/x7QMBL+01zmlL n9mdtiPnPpmO0CCotH89FogRRC1ZVg4gU7+MViaU8VNeMDTK2Dcpd3yTVGkvwNEsWhwCk0nYEBA T0E/n65iriSkHGzSRY0JHraKX668i7ltnuG8Yp6ZM0jPlo37NvXd9cYr3nsK7PlK+wTG23bxMKB TvXxMhTB/RlSs4PlinHc2D2dQ== X-Received: by 2002:a05:600c:4e87:b0:48a:768b:eea9 with SMTP id 5b1f17b1804b1-48fe60e51bamr60859795e9.4.1778852138971; Fri, 15 May 2026 06:35:38 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec39806sm14907038f8f.9.2026.05.15.06.35.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 06:35:38 -0700 (PDT) Message-ID: <4491e1e3-07d5-469f-ac3c-df6e133ba906@suse.com> Date: Fri, 15 May 2026 15:35:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 13/16] RISC-V: avoid buffer underrun in subset parsing From: Jan Beulich To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , jiawei References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-Spam-Status: No, score=-3016.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 In both instances 'p' can be the first character. Inspecting the character immediately ahead of it is then UB. To increase similarity between the two checks (each), also move the increment of q past the check for the (bogus) "p" ending. Correct indentation in nearby code, where it being wrong is actively misleading. Reviewed-by: Jiawei --- Why is it that P is recognized as an extension when there's no other support there for it? --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2113,25 +2113,27 @@ riscv_parse_extensions (riscv_parse_subs find_any_version = true; else if (find_any_version && !find_minor_version + && q > subset && *q == 'p' && ISDIGIT (*(q - 1))) - find_minor_version = true; + find_minor_version = true; else break; } - q++; /* Check if the end of extension is 'p' or not. If yes, then the second letter from the end cannot be number. */ - if (*(q - 1) == 'p' && ISDIGIT (*(q - 2))) + if (q > subset && *q == 'p' && ISDIGIT (*(q - 1))) { - *q = '\0'; + q[1] = '\0'; rps->error_handler (_("%s: invalid prefixed ISA extension `%s' ends with p"), arch, subset); free (subset); return NULL; } + + q++; } int major_version = RISCV_UNKNOWN_VERSION; @@ -2672,20 +2674,19 @@ riscv_update_subset1 (riscv_parse_subset find_any_version = true; else if (find_any_version && !find_minor_version + && q > subset && *q == 'p' && ISDIGIT (*(q - 1))) find_minor_version = true; else break; } - if (len > 0) - q++; /* Check if the end of extension is 'p' or not. If yes, then the second letter from the end cannot be number. */ - if (len > 1 && *(q - 1) == 'p' && ISDIGIT (*(q - 2))) + if (q > subset && *q == 'p' && ISDIGIT (*(q - 1))) { - *q = '\0'; + q[1] = '\0'; rps->error_handler (_("%sinvalid ISA extension `%s' ends with p in %s `%s'"), errmsg_internal, subset, errmsg_caller, implicit_exts); @@ -2693,6 +2694,9 @@ riscv_update_subset1 (riscv_parse_subset return false; } + if (len > 0) + q++; + end_of_version = riscv_parsing_subset_version (q, &major_version, &minor_version); *q = '\0';