From patchwork Fri Apr 1 19:36:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 555593 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp1832494mag; Fri, 1 Apr 2022 12:37:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxPCMKV9fX2vCnP5PZhCNgwZf8biXe82DlGoOrQeELP88g7Wj48PnCS410kLOIUuuMQw8Y X-Received: by 2002:ac8:594a:0:b0:2e1:c007:1465 with SMTP id 10-20020ac8594a000000b002e1c0071465mr9793709qtz.646.1648841861821; Fri, 01 Apr 2022 12:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648841861; cv=none; d=google.com; s=arc-20160816; b=DgIXi9Jxdx/5Q5Wp0QB/FlXf0ImcH7NRYbYj5muXCDIACxcWIMw2OTnN+vwQd41lNQ /j2Uv0ap4QS8JkTDeExj8j0ZoNyJhpCrprO9+3rpNuQOEnkt2MpVxJO7VMtn9ClhV4ZJ 5864XBV0UcoGzLtzNV/MRWQ31UuQWDHPYHn82aSZ3vF/1jW+2yka9l2yqNEB49BOnX9G N3JZdvw9hJRhcbNMPU2cMR9eDRYF0sJVVjNuKgakN+ReaFj0tLC68GQN7YRvA7MREkBf sv/BaY9kTLCGhI6Vw9+fLQploCpLall3V4s8i9hVaefmPgXR6gdG25p1H2Uvk3BaBvUi R/AA== 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:message-id:date:subject:to:from:dkim-signature; bh=HH89zNDS/X/fLmLBuFxyjUMGXFM38PgAoiJxhKCSmAg=; b=XNNvbdWRhqKZpWALckqMDevYuwbpyJHwf1X9v36w9RVWkXbEpUl7RPTFGt4oiDIzk3 LfvUQX9i68B+kMhoAx7qwzbrNg7BkXpFrI9iHX8Wx96bvEPoSqLdYGpqGX9QrwOShlPm 3C1J94Ckuq7me47yeMmxkt3pZjIIaidmjUubbaT9VlzmlKilCa0JQm5fvj+N8RDbupIG 1JANJhHnWNjd0+KQHjhn/Ur0+XR4d7lShzuWFKERBplndAE0H3MPoXcwpw6dEevut0ay UH0sYrZVG9DBm0bGxSktFko30Zp15iJOmwRlMB7KnuHWFScN1jxrogYshOZ0s7+xkUNi cAKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mXskzBr4; 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 q62-20020a378e41000000b0069990a80010si1370712qkd.15.2022.04.01.12.37.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Apr 2022 12:37:41 -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=mXskzBr4; 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]:49266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naN5Z-00045c-Dj for patch@linaro.org; Fri, 01 Apr 2022 15:37:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naN55-00043M-A0 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 15:37:11 -0400 Received: from [2a00:1450:4864:20::62a] (port=38400 helo=mail-ej1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naN53-0005IT-Q5 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 15:37:10 -0400 Received: by mail-ej1-x62a.google.com with SMTP id r13so7944681ejd.5 for ; Fri, 01 Apr 2022 12:37:09 -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:mime-version :content-transfer-encoding; bh=HH89zNDS/X/fLmLBuFxyjUMGXFM38PgAoiJxhKCSmAg=; b=mXskzBr4oJo1rioEY3MuJcMS5s9DS3TG+8p9xM9uUf19y1liwfjES/xIVv3Lw7VSml 5i/FgwE9+ga2kLrdKP3FsGNZl/d3el4GGBXx3f/8b59KF51MXHujGAgP61N0nLdVPgkI aJzQBq4cU0JjNuEv+DU/+fUGX/mScoK4uBtKS2eu4dzEUxSmWz04pK1hJ4mEwuzaSSIi xc451p587kIL09Tcm1bRsaihxWe6OF2bA/N7z9lm7N4wEKpFB1ZCUPiGBXJDAG9CHP7o +0jtNg4/I8Y4HtEk2aYezu5GfaFOMpjDxXZPNp9dDBfxcLlNm8PEu0BacqS9vzxkWmG3 rVsQ== 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:mime-version :content-transfer-encoding; bh=HH89zNDS/X/fLmLBuFxyjUMGXFM38PgAoiJxhKCSmAg=; b=0/hWztkt2p0Hq1c7hDq/99ufRuVaHEWUFmMdUTlOyt/UZo6b92OsMrYl9+bua2R02z //bm3o1kR9cCfKsDA/EoKb1Y2xFC/XEhTD2ks+wzHBbQOIX7rpmH5ZRRi8mxC5DLAFNa Qkw1STqqC8gWksKY9on5TI8FPQ2hi+WieBomGBXUK9wWgYuzp5j9I2EXxKfH0xTMLte1 GtlucTIIbDwJfoDSoNxCgTDY97bsoI895WGWU/+9wGlZPbAanQ3EcIrY2R/G7S8c3pHy Wv5NzVZgdOVcA2KFp48mdXQfEl8F42gu+2ELff26hKJewU2mzjTLAbCKsAoCatUaslGA 2IJA== X-Gm-Message-State: AOAM532ikL8VcBijf9qAE9jtx2YLT3hEWG1yu6L6QZ1/b865oMX78ylU VHZyY9JYF41ZaaFg+wvBpUwG9GP3mq9/8NanJk0= X-Received: by 2002:a17:906:9c83:b0:6df:839a:a6d0 with SMTP id fj3-20020a1709069c8300b006df839aa6d0mr1126944ejc.419.1648841828128; Fri, 01 Apr 2022 12:37:08 -0700 (PDT) Received: from localhost.localdomain ([185.81.138.17]) by smtp.gmail.com with ESMTPSA id n25-20020aa7db59000000b00415965e9727sm1539987edt.18.2022.04.01.12.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 12:37:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] target/s390x: Fix the accumulation of ccm in op_icm Date: Fri, 1 Apr 2022 13:36:59 -0600 Message-Id: <20220401193659.332079-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: qemu-s390x@nongnu.org, cohuck@redhat.com, thuth@redhat.com, david@redhat.com 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: Thomas Huth Reviewed-by: David Hildenbrand --- 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 5acfc0ff9b..ea7baf0832 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;