From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 8EFD63858C53 for ; Wed, 23 Aug 2023 01:44:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8EFD63858C53 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-x436.google.com with SMTP id d2e1a72fcca58-68a3f0a7092so2692117b3a.1 for ; Tue, 22 Aug 2023 18:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692755080; x=1693359880; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=OoCQP8Y2RUnmpueEvNudWpSkhFDGN6Tlepk0DAEuFLw=; b=k5TAmvRl4VBzZ0URnBhpg3XkI6tP26s02Wqi1hBgA3IgxeK6Y25gln5k0YVqqdiisr XVamLPgdvAktn1MPhD+Xe6M0ZtWaGnrdNLrjR+7vgW8TUa2r/b/He3Wkh85L7hrpyPjF PLUFEFho1vRnKt407g4IO/CnPRihLyI6UygQSqTAF5DxnnP2JssBO/2AMsMHzRqr8+YC 4XA6/XtjnIIXbUVjE1nTtMZ8/7LGInHQe13PPa5aL+ec2sKJVWpW93MAPAP26ZeRMLRD oftCyEUmuJzigVb6CEDXimfqbjSagrltSdCUoc/6AzZt93Z2YaoUCrO3eXYgtMyziKi7 Gc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692755080; x=1693359880; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OoCQP8Y2RUnmpueEvNudWpSkhFDGN6Tlepk0DAEuFLw=; b=KjOdDwTLGQ5U7bkF9oknXpiXnErzl/Mwt5lExx8WPHQ2HduY871radivteh+9Eww+5 Bxt+6WxhR5vTwYOILMWpfdDoqnez9SLBu/yRywhf/sXm1JPuHvhmYKxC2L2de+Tx26zZ AL/KXfnD3YwhMarvoaI2xH8uganVpZxEftCk9DLULTbWEjcc5VsIgyPPUoMSqmbo00GI lzECntJ865ByRI7jljSmcPlk1hEpPqB77ZGTWGmHPKrVaJ/Z0Dyy1opCrzrQdZ33pAQV EQ4XhnLXSckLqmtjY9KOcCkD7ZsXpqNOdxqKNmUk0RLERqo5Mf/YLXWfCXzZOrLkwHhF SOEw== X-Gm-Message-State: AOJu0YyQIHN2ID6NYEDXFDiV5/dJVjymBzEeu8w47o7bgu7FeSQl8/xM XMMe8zsT6IgtHx2tw0LPiW0pCjNlgsQ= X-Google-Smtp-Source: AGHT+IHWrAOzMuHSouyL5hiek6Ct1RyBeNIyJNMTm8CcM/r6sYS6zxFYCt5eDCtFy1SAEz2F+X1moQ== X-Received: by 2002:a05:6a00:23c8:b0:68a:2272:23d8 with SMTP id g8-20020a056a0023c800b0068a227223d8mr11596422pfc.5.1692755080557; Tue, 22 Aug 2023 18:44:40 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id i3-20020aa787c3000000b006877b0b31c2sm8569643pfo.147.2023.08.22.18.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 18:44:40 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 9D9A71142918; Wed, 23 Aug 2023 11:14:37 +0930 (ACST) Date: Wed, 23 Aug 2023 11:14:37 +0930 From: Alan Modra To: binutils@sourceware.org Cc: Paul Iannetta Subject: kvx: ubsan: integer overflow Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3034.2 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: This fixes a few places where ubsan complains about signed integer overflow when running the testsuite, and that clz(0) is undefined. When fixing the clz problem, I also noticed that we'd get complaints if pval is ever LLONG_MIN. Fix that by using unsigned arithmetic. * config/kvx-parse.c (get_token_class): Avoid signed overflow. Don't clz(0). * config/tc-kvx.c (PARALLEL_BIT): Avoid signed overflow. diff --git a/gas/config/kvx-parse.c b/gas/config/kvx-parse.c index ec3f912c476..fe0e2aee737 100644 --- a/gas/config/kvx-parse.c +++ b/gas/config/kvx-parse.c @@ -515,9 +515,9 @@ get_token_class (struct token_s *token, struct token_classes *classes, int insn_ ? token->val : strtoull (tok + (tok[0] == '-') + (tok[0] == '+'), NULL, 0); long long val = uval; - long long pval = val < 0 ? -val : val; - int neg_power2_p = val < 0 && !(pval & (pval - 1)); - unsigned int len = 8 * sizeof (pval) - __builtin_clzll (pval); + long long pval = val < 0 ? -uval : uval; + int neg_power2_p = val < 0 && !(uval & (uval - 1)); + unsigned len = pval ? 8 * sizeof (pval) - __builtin_clzll (pval) : 0; for (; class[cur].class_id != -1 && ((unsigned int) (class[cur].sz < 0 ? - class[cur].sz - !neg_power2_p : class[cur].sz) < len || (exp.X_op == O_symbol && !has_relocation_of_size (str_hash_find (env.reloc_hash, TOKEN_NAME (class[cur].class_id)))) diff --git a/gas/config/tc-kvx.c b/gas/config/tc-kvx.c index 3cf6b27976d..0e67ead4449 100644 --- a/gas/config/tc-kvx.c +++ b/gas/config/tc-kvx.c @@ -49,7 +49,7 @@ static void supported_cores (char buf[], size_t buflen); #define STRNEQ(x,y,n) !strncmp(((x) ? (x) : ""), ((y) ? (y) : ""),(n)) /* The PARALLEL_BIT is set to 0 when an instruction is the last of a bundle. */ -#define PARALLEL_BIT (1 << 31) +#define PARALLEL_BIT (1u << 31) /*TB begin*/ int size_type_function = 1; -- Alan Modra Australia Development Lab, IBM