From nobody Tue May 7 18:32:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594061642; cv=none; d=zohomail.com; s=zohoarc; b=NaEWl36yAmD3nuO0FNF/Z422jad42y4qkpg4/9FKLH1sbNL1LSjB5QmMJzU7p9hCAREZAFH/QoLdeT6vJOAWQxmKZdMw+v/Tb3exd0BicpzMpPDDyLOCUIJfxp68IrjMSvCORl+V1u9vOyej8ItUWpoWX0vzCqlyG6La9l5Vu+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594061642; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qxipx9m0vKeP12B9CxfpMSMsmfVBM9RcOjG9qZgvzwg=; b=kvRKiqdkJ9/g0ZwAIkboGOPbt96bjqRtehH2fK8wvFX1RNQZOwQdZc6YMOZlfz7Fgcl0/o8nfIu8oZvrtTqrFWaQbab9UE3BQT+REICdAOqF1Pp3dm9/CwtfreVdR+o8ByOfQaMYDEZzd5UuRXGNLt0Wgkw4336iY8OOZzOVi2o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594061641976565.1080117225093; Mon, 6 Jul 2020 11:54:01 -0700 (PDT) Received: from localhost ([::1]:46876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsWFc-0002WC-Ih for importer@patchew.org; Mon, 06 Jul 2020 14:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsWEa-0000vj-FL for qemu-devel@nongnu.org; Mon, 06 Jul 2020 14:52:56 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:36313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsWEY-0000fL-Sm for qemu-devel@nongnu.org; Mon, 06 Jul 2020 14:52:56 -0400 Received: by mail-pl1-x630.google.com with SMTP id d10so3650431pll.3 for ; Mon, 06 Jul 2020 11:52:54 -0700 (PDT) Received: from localhost.localdomain (097-090-106-114.biz.spectrum.com. [97.90.106.114]) by smtp.gmail.com with ESMTPSA id q6sm19988179pfg.76.2020.07.06.11.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 11:52:52 -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=Qxipx9m0vKeP12B9CxfpMSMsmfVBM9RcOjG9qZgvzwg=; b=b0bz8qB12ZZi91OgFBDHu+nLsCehcBtofcgLpJz8Ob5PtCV70tOUllcYegKAEuv3Wp dRRx30v9FqmFIAWhF546BpMKXaX8fqqfJ6tY7g8r3YLMuVGAyZrsxx+/PL9O/3/Y7cKm 3JyjQKWUFQiLfKRxxXOsw+qW2pTeL9A0fnOzB1BEfKp241LeptdTo3Bd0ZInTh5mlX6H zbyTa7Az64m6rJn1eHoM8kgTmavdWqrNWmrgulKbNXSjluNOxVzyfdlA1aLvPhp0jmXa T3llOE5s+avY9MPzBNSnqLks32vapxNfkuLEZ6R6G+b4hJE6McxKGlLwMThhdFdeFtnw 8PDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qxipx9m0vKeP12B9CxfpMSMsmfVBM9RcOjG9qZgvzwg=; b=f6DU90zQWGI26gmlCA6cq7g+bAflaoP9h+LKDqSkmwB1D1usGAS9m1nVmmZPmyYrsa ZPoUlvt7Nbg7/WubN0Okfq3ydvSPKyWPaE2QsesVkjL4WvFzsLSMq5BR1CrX408JE6EG mFC1rBZ6q0175TvVPnQAyH5osfT8QxunAvLap8svvq8k5Bej1nRDqZs/w7dEBIf6qhCZ X4UA1Gz5AG/biinIreoA/G0fAc5G4OaVFBl7x1nA9hzv5KdAwFxHkaNVipLO86lXwVIY /3zXy9CC65OFsKdu/mgqDhUD/njyAHGf0nTyP2m3qzBWp8YmYYxI08CfU9gdZbedNoTQ EFpw== X-Gm-Message-State: AOAM533ZXPnCQw93A9+7H6H0LghYfFLx4Me8E+T6FYEMM1X0jX+mS04X +PmAq1XKbk/M4l2SZf/GhPgYPVXa2zI= X-Google-Smtp-Source: ABdhPJz9R9l56rwNCYtlioBidRaxu4H6/SEZ9IjX00H/TMsks0cgMxeFW6ZDiKjPXeJcFf7UkYKiIQ== X-Received: by 2002:a17:90a:222d:: with SMTP id c42mr616406pje.126.1594061573146; Mon, 06 Jul 2020 11:52:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/2] tcg/ppc: Sanitize immediate shifts Date: Mon, 6 Jul 2020 11:52:47 -0700 Message-Id: <20200706185248.118447-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200706185248.118447-1-richard.henderson@linaro.org> References: <20200706185248.118447-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, "Catherine A. Frederick" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: "Catherine A. Frederick" Sanitize shift constants so that shift operations with large constants don't generate invalid instructions. Signed-off-by: Catherine A. Frederick Message-Id: <20200607211100.22858-1-agrecascino123@gmail.com> Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 7da67086c6..c8d1e765d9 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -2610,21 +2610,24 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc= , const TCGArg *args, =20 case INDEX_op_shl_i32: if (const_args[2]) { - tcg_out_shli32(s, args[0], args[1], args[2]); + /* Limit immediate shift count lest we create an illegal insn.= */ + tcg_out_shli32(s, args[0], args[1], args[2] & 31); } else { tcg_out32(s, SLW | SAB(args[1], args[0], args[2])); } break; case INDEX_op_shr_i32: if (const_args[2]) { - tcg_out_shri32(s, args[0], args[1], args[2]); + /* Limit immediate shift count lest we create an illegal insn.= */ + tcg_out_shri32(s, args[0], args[1], args[2] & 31); } else { tcg_out32(s, SRW | SAB(args[1], args[0], args[2])); } break; case INDEX_op_sar_i32: if (const_args[2]) { - tcg_out32(s, SRAWI | RS(args[1]) | RA(args[0]) | SH(args[2])); + /* Limit immediate shift count lest we create an illegal insn.= */ + tcg_out32(s, SRAWI | RS(args[1]) | RA(args[0]) | SH(args[2] & = 31)); } else { tcg_out32(s, SRAW | SAB(args[1], args[0], args[2])); } @@ -2696,14 +2699,16 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc= , const TCGArg *args, =20 case INDEX_op_shl_i64: if (const_args[2]) { - tcg_out_shli64(s, args[0], args[1], args[2]); + /* Limit immediate shift count lest we create an illegal insn.= */ + tcg_out_shli64(s, args[0], args[1], args[2] & 63); } else { tcg_out32(s, SLD | SAB(args[1], args[0], args[2])); } break; case INDEX_op_shr_i64: if (const_args[2]) { - tcg_out_shri64(s, args[0], args[1], args[2]); + /* Limit immediate shift count lest we create an illegal insn.= */ + tcg_out_shri64(s, args[0], args[1], args[2] & 63); } else { tcg_out32(s, SRD | SAB(args[1], args[0], args[2])); } --=20 2.25.1 From nobody Tue May 7 18:32:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594061717; cv=none; d=zohomail.com; s=zohoarc; b=XiVSi8Mqgy+uacouLh3F45AtTlIJFxFTMuolh2XiX+vobVUJDzd2AEcJpSGrOM+CvMValr6FUnJnH8xa+9FOfFRrQIj1lUUYqa4hZfi5m1McELEX4e4sFmpwILZWdeyaBH/AMuuomWEnIFOz0UHhvZP0cmqsAqgre4Fl8yOb7jM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594061717; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hUkw5IV25PzdOpbKU56LvtYexDUOIKyrljMdyGHGiXE=; b=JGr6rYKjot6hO8vpgdT3LZNAEj4Vd/Q9NR5/ew6ZhlG5UQGWwRQ6jaJXmTOh159pKqZX/Vu3W7DSZU4XE0NfToxNN7ftT05vwWrcpqjVWBcPVM03lqijP+bRFRb2xjvKnwzi82fZ3AecVLk6dyJn0wwP/jk7cIvvQavQ7+FRZhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594061717491122.70830109855638; Mon, 6 Jul 2020 11:55:17 -0700 (PDT) Received: from localhost ([::1]:51402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsWGq-0004Kf-5p for importer@patchew.org; Mon, 06 Jul 2020 14:55:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsWEc-00010W-0w for qemu-devel@nongnu.org; Mon, 06 Jul 2020 14:52:58 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:52065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsWEa-0000fg-FS for qemu-devel@nongnu.org; Mon, 06 Jul 2020 14:52:57 -0400 Received: by mail-pj1-x1032.google.com with SMTP id l6so14089819pjq.1 for ; Mon, 06 Jul 2020 11:52:56 -0700 (PDT) Received: from localhost.localdomain (097-090-106-114.biz.spectrum.com. [97.90.106.114]) by smtp.gmail.com with ESMTPSA id q6sm19988179pfg.76.2020.07.06.11.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 11:52:53 -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=hUkw5IV25PzdOpbKU56LvtYexDUOIKyrljMdyGHGiXE=; b=qfyWv7RleJAdZTrZmwUL4ineINZT9SG9RU3WZbqZOU4XufGdslg9daes6nC1hcwZTb s1mLxJRj6glIT103LtuoYoIXcCvT5GzUpiUREre6/zhGBsyMkLMAXMxW9guOYeM3jBEp 8Dvel4Gu4mpsAHupPoZD+CJkw/u3wknsASa/tnMxpk+y8NxwSsWSQnMB7SYXOGRpgULD qKzANq+7dBcEOwokg17gwIeU9v7yut0TejndXsc4wFJpxaojyt5TtGvCEzbWl5QaNB31 AhGmHfLhWQqrmChxJRr2oMJmVfFwSTUyzDIVe+srpeopzSb80hfBRJz8iuyRNR/hWIdF 06Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hUkw5IV25PzdOpbKU56LvtYexDUOIKyrljMdyGHGiXE=; b=kUhg3UsYmkijd3+W2E8RbcNitEXbbR2jBklg8L3FcgnozvbYHTg5O42BuNjbLVM3v1 /IS5YxLpU0rtt/AhHFLi3t5g8pYOnC/gBU1Xq++Q/pZqEr6p4IBa2AkIl5C+FavR0mft sWc+PXbAvsrQrQy82kHV3umhLPwXd/D/l5DZfNqzqkQxmi4LntYKL5BXCmFaJZgxHgvo xK90B1pme+3j1BKOsClUFyPIbPONDJtZL+w2yofD0jXnuUfyp8q7HXcjdKwwXss5oilR u7QvpNEbLGSRWll3BQvMmy4/KgnFZxQdzVT01Fp6OuQ+OY40gTFeXXo7YAMNVX8WpueY w5EA== X-Gm-Message-State: AOAM532uFuAVQ3zNW9fPxkYfLwooEQnItXFVRm0w43zpPtO0TWxtM87k 5P/e515MXNDPr9OjV2OiGBogoCeN+n0= X-Google-Smtp-Source: ABdhPJzI+8AIZXU/YL6JBRHQvvJTxDK0I5U9+M7Wirawsc8p2YqvEX1EvPNv1Y4Bs7ZUrXNu4BT8dQ== X-Received: by 2002:a17:90a:a887:: with SMTP id h7mr615794pjq.0.1594061574641; Mon, 06 Jul 2020 11:52:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/2] tcg: Fix do_nonatomic_op_* vs signed operations Date: Mon, 6 Jul 2020 11:52:48 -0700 Message-Id: <20200706185248.118447-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200706185248.118447-1-richard.henderson@linaro.org> References: <20200706185248.118447-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, LIU Zhiwei Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The smin/smax/umin/umax operations require the operands to be properly sign extended. Do not drop the MO_SIGN bit from the load, and additionally extend the val input. Reviewed-by: LIU Zhiwei Reported-by: LIU Zhiwei Signed-off-by: Richard Henderson Message-Id: <20200701165646.1901320-1-richard.henderson@linaro.org> --- tcg/tcg-op.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index e60b74fb82..4b8a473fad 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -3189,8 +3189,9 @@ static void do_nonatomic_op_i32(TCGv_i32 ret, TCGv ad= dr, TCGv_i32 val, =20 memop =3D tcg_canonicalize_memop(memop, 0, 0); =20 - tcg_gen_qemu_ld_i32(t1, addr, idx, memop & ~MO_SIGN); - gen(t2, t1, val); + tcg_gen_qemu_ld_i32(t1, addr, idx, memop); + tcg_gen_ext_i32(t2, val, memop); + gen(t2, t1, t2); tcg_gen_qemu_st_i32(t2, addr, idx, memop); =20 tcg_gen_ext_i32(ret, (new_val ? t2 : t1), memop); @@ -3232,8 +3233,9 @@ static void do_nonatomic_op_i64(TCGv_i64 ret, TCGv ad= dr, TCGv_i64 val, =20 memop =3D tcg_canonicalize_memop(memop, 1, 0); =20 - tcg_gen_qemu_ld_i64(t1, addr, idx, memop & ~MO_SIGN); - gen(t2, t1, val); + tcg_gen_qemu_ld_i64(t1, addr, idx, memop); + tcg_gen_ext_i64(t2, val, memop); + gen(t2, t1, t2); tcg_gen_qemu_st_i64(t2, addr, idx, memop); =20 tcg_gen_ext_i64(ret, (new_val ? t2 : t1), memop); --=20 2.25.1