From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 99A1B3858C27 for ; Sat, 12 Mar 2022 07:40:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 99A1B3858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn Received: from 5.5.5 (unknown [10.2.5.5]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxn895Tixi3hAIAA--.27831S2; Sat, 12 Mar 2022 15:40:48 +0800 (CST) From: liuzhensong To: binutils@sourceware.org Cc: liuzhensong Subject: [PATCH] ubsan: loongarch : signed integer shift overflow. Date: Sat, 12 Mar 2022 15:40:39 +0800 Message-Id: <20220312074039.3808325-1-liuzhensong@loongson.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf9Dxn895Tixi3hAIAA--.27831S2 X-Coremail-Antispam: 1UD129KBjvJXoW7CFyUZFy7urykWw1xCF18Grg_yoW8GFy3pF W7C3W3Kr45K3s3Cr1kCrZ5Jrn8Xry7Gr17ua4Ut3WSyrsxW3srXF4UtrW3uas0k3yIqrs8 Xa1kW39093WIgF7anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvI14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j 6r4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr 1j6F4UJwAaw2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMc vjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v 4I1lc2xSY4AK6svPMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I 0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWU XVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcV CY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Zr0_Wr1UMIIF0xvEx4A2jsIE 14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf 9x0JUv0PfUUUUU= X-CM-SenderInfo: holx6xphqv003j6o00pqjv00gofq/ X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2022 07:40:53 -0000 opcodes/ * loongarch-coder.c : int32_t ret = 0; ret <<= sizeof (ret) * 8 - len; ret >>= sizeof (ret) * 8 - len; ... Avoid ubsan warning. --- opcodes/loongarch-coder.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/opcodes/loongarch-coder.c b/opcodes/loongarch-coder.c index cb6d5648da0..c957b95df74 100644 --- a/opcodes/loongarch-coder.c +++ b/opcodes/loongarch-coder.c @@ -106,11 +106,13 @@ loongarch_decode_imm (const char *bit_field, insn_t insn, int si) else if (*bit_field_1 == '+') ret += atoi (bit_field_1 + 1); + /* Extend signed bit. */ if (si) { - ret <<= sizeof (ret) * 8 - len; - ret >>= sizeof (ret) * 8 - len; + uint32_t sign = 1u << (len - 1); + ret = (ret ^ sign) - sign; } + return ret; } @@ -133,7 +135,8 @@ loongarch_encode_imm (const char *bit_field, int32_t imm) else if (*t == '+') uimm -= atoi (t + 1); - uimm <<= sizeof (uimm) * 8 - width; + uimm = width ? (uimm << (sizeof (uimm) * 8 - width)) : 0; + while (1) { b_start = strtol (bit_field_1, &bit_field_1, 10); @@ -141,10 +144,10 @@ loongarch_encode_imm (const char *bit_field, int32_t imm) break; width = strtol (bit_field_1 + 1, &bit_field_1, 10); i = uimm; - i >>= sizeof (i) * 8 - width; - i <<= b_start; + i = width ? (i >> (sizeof (i) * 8 - width)) : 0; + i = (b_start == 32) ? 0 : (i << b_start); ret |= i; - uimm <<= width; + uimm = (width == 32) ? 0 : (uimm << width); if (*bit_field_1 != '|') break; -- 2.31.1