From patchwork Wed Apr 27 04:39:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566747 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4181309map; Tue, 26 Apr 2022 21:41:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB7UCC5TsJzj5iD4oAGmsZnqPSsdHPaVOMxOya9HjGrGonmosJnTluyoI+RUK2cRTpAMY/ X-Received: by 2002:a05:622a:293:b0:2f3:692e:f04 with SMTP id z19-20020a05622a029300b002f3692e0f04mr8891390qtw.191.1651034474021; Tue, 26 Apr 2022 21:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651034474; cv=none; d=google.com; s=arc-20160816; b=jdnzndMS/m0ZM58whMMgE+pAZ8C1Tz6UhzyrTnrTEqH8jlej3PfTFsZurEzN6oBqeM THfV5wpyZ93BCdMrX2qHjcc+wV2hcuV1cM4ZrxREI42rRwdERfAK00LHNgq1KnUpBK8B J79Q0vb7/81//+dHV/pBoSvKO9v/gyhZ60/MZCJCRzuwUg2vOJlH5qu3tTNMSkhAKdvB 63hcM8dFJJqOcZBTnxXcOf87wZU7bgkacaRm+17+m0XqippLzsuO+zIWGvpsjitRM8BU VrdGyxO40mD5OWGTIFaMn3uZEDeYIF0YlsylzoMv4i5He0RqPMY65FVyCd7nKOSEvf8c wtQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=g1WB0RTRAo0nXyQSrlhIlewb+RTtC6M6f1BSHd8CFHI=; b=HkeYnuLqwkpmJHF3gkfHZlA1KJTkwBG1FtjpHB6pdnhgSYdaldz9QTCOGY2G7zf15j Jeye3W+KUwy0zYF3zKh5qYl6Txp4lKs3npADJeN62EOjQ4j9pwwLGm5fh31p0ckm0yHv bGJvDxeYzQE6jl4M9TPRwHXW7O1P6rkCVga6NcmIMkwnhcRAoSBa+wh6XT83lJQhVB54 sjrjE/pFFFkKuxttfjui6b4KYIKPo+DU1sRoBJOFv88uowuWM41ZeMl9i9A9vexx/Jqs eqsAQzzVDPUPBYSB6+WoDtbDticIIm+JBHhyIx6Cs9ibmLXNdTtQa7vUa9DZzfSsu3Q2 QZBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X9K3SldP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay32-20020a05620a17a000b0069c0fb8ee83si126385qkb.755.2022.04.26.21.41.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 21:41:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X9K3SldP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njZUH-0001Nj-JC for patch@linaro.org; Wed, 27 Apr 2022 00:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njZSx-0001IP-1C for qemu-devel@nongnu.org; Wed, 27 Apr 2022 00:39:51 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:42522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njZSt-0007SJ-0R for qemu-devel@nongnu.org; Wed, 27 Apr 2022 00:39:49 -0400 Received: by mail-pg1-x52a.google.com with SMTP id bg9so532474pgb.9 for ; Tue, 26 Apr 2022 21:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g1WB0RTRAo0nXyQSrlhIlewb+RTtC6M6f1BSHd8CFHI=; b=X9K3SldPigsK7ip1iVtWsq8GXBdpiwx9rXu8Es1/Ocyupu/vnU7PNQaJ3NTgTK0Vac voLioW8w7N0KWim6EwW97joVrPe9/kRV3YUgmqMYhcKkOQqHLFGt8tvgGqEo79K4cQSA 05Rwhde7aMxItXccFeETKeRTDZof0kJQ8y/7v7Jh5evORJe88NZoa9k4d++OBcR2hqo1 UH9Lp16BYrglmi88PvkLlln2325fdujVhXoAgFK8kq5d+GkiIAW5jhQ5GloaC6IMvpCE Ht9rDrbbGzGLND2dpynFfyvdXLbZaU5alht5Iqr4WNsw8XCFf1Fsm0YgQyzB0PzzgwEa Xehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g1WB0RTRAo0nXyQSrlhIlewb+RTtC6M6f1BSHd8CFHI=; b=gPtxJ00diR25cz7T7hbCFAmKD3/FkOfTtWc+9BmpolO7NTsUXwnO41MMWWSkA559UV IT7Hml33xPMOWsPfm3g3UQ56VsxRCnDhuKeecEDu1DUDcX0Tn6FohlL7Pxrgy780IFBs pM2msvjq49XWkoodqa7zTrLSXMIP97eAcArxURDT2E80UJujDOgcLqo0ntV8yTbgOxg0 +yoIKkxIuZmZib7bD28FWHU/TYvdwtJgTlhQKlEM7k0cIApv4girzZ1adqIptR7ABi17 aKJq1TPdl67o8f7q7NAIMSbNHZS7gyBsqmyZ77fgF4vjT2UAiVlzv4w6Sl4X/jvSAAyX J+EA== X-Gm-Message-State: AOAM532LQ1gBn4h5T/94L5G5yzBlbeyMEkzn4iCzYQSNdGTc79YVtrMb RPmaq5DDjSPEkQ00HdDx4DHiY3JIzkM11w== X-Received: by 2002:a65:6a4c:0:b0:39c:f169:b54a with SMTP id o12-20020a656a4c000000b0039cf169b54amr22626718pgu.384.1651034385363; Tue, 26 Apr 2022 21:39:45 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id f16-20020aa78b10000000b0050a81508653sm16875632pfd.198.2022.04.26.21.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 21:39:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/6] target/s390x: Fix the accumulation of ccm in op_icm Date: Tue, 26 Apr 2022 21:39:38 -0700 Message-Id: <20220427043942.294654-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220427043942.294654-1-richard.henderson@linaro.org> References: <20220427043942.294654-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Coverity rightly reports that 0xff << pos can overflow. This would affect the ICMH instruction. Fixes: Coverity CID 1487161 Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Message-Id: <20220401193659.332079-1-richard.henderson@linaro.org> --- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index ae70368966..8f092dab95 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -2622,7 +2622,7 @@ static DisasJumpType op_icm(DisasContext *s, DisasOps *o) tcg_gen_qemu_ld8u(tmp, o->in2, get_mem_index(s)); tcg_gen_addi_i64(o->in2, o->in2, 1); tcg_gen_deposit_i64(o->out, o->out, tmp, pos, 8); - ccm |= 0xff << pos; + ccm |= 0xffull << pos; } m3 = (m3 << 1) & 0xf; pos -= 8;