From patchwork Tue Jul 25 13:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 706141 Delivered-To: patch@linaro.org Received: by 2002:a5d:464f:0:b0:317:2194:b2bc with SMTP id j15csp194896wrs; Tue, 25 Jul 2023 06:50:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlESkFlXANtQuapb4XohxP5diyL4sPRDME11cbT8XCN1ogX378HkrVCq1dja9h+fzTyWBVJS X-Received: by 2002:a05:622a:182:b0:403:a98a:dcd1 with SMTP id s2-20020a05622a018200b00403a98adcd1mr3711155qtw.29.1690293046500; Tue, 25 Jul 2023 06:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690293046; cv=none; d=google.com; s=arc-20160816; b=gRDsNMiUQK5f01lX1KsTCP1OhWswoe7LkaL9pLSjRN1CnoyrbslRgj1RYuQ8RGioo0 aBN5u0Gqy/yK2Bcoakm46/TaRQHV+v5Cs63DrhV8QUADb1Qq4yMElW7LQmq9ZvVYV2Sx ovuQZz0AlbVptv1E0Vje06SoMI6UVbtPQ59eJX+5O3R+BnPMKRwn3PpdBjaKKwps/a0y vos5+fVsmNVM3a2iJboq523+q/tNcltOZk7VUIFEgXFhDS/d8ZgusazSbVmS6WEfRuFU 5zRz+z7ljCtFHElriNWQWwvQJ3j029XcI0grDNb+IhKzRYArNJEj9tpn7PcczpJpEv6j 43Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from; bh=6IGXKFxm0uipGsF4C5bCoIlSxWEitK3Xy43vAyCuRpA=; fh=5JdQHG30MWzFvV/nMAZA9GY4o6OT/LgtWD8WVMxftDg=; b=s+J6/LCx9lH7LMHX+s0mkPTmBvPEr6KCoJi6Jo5Xrmzykp58R+ouVyZH6EqGFXswFZ ZsFuHo8LfyutV4+tcqClFXwY+e8iHuuj2Jsd4dhf5yUspC1AYxkITCfWgGMCi1uYJjcu mcsp+8fZXMepjjt0ycE2jFX6T7ud2NgSnNqkQU+V516d+uyTkAgFBr3wa8CbNAZnNlp1 eHh6yhfeoWbRpkGN52RYjvN0zemXDIom+Vea6uMLtzmxH6GKMnsc3PDI/L59TFE9zhI1 lW16dmk3h3VtZjnLZFIU6yBmSdIoL1wo+vontFIMrM2nmN69VjuRFBuBf28DEqqYrLX4 JllA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y9-20020a05622a004900b00403c5ae5a58si6529411qtw.804.2023.07.25.06.50.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jul 2023 06:50:46 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOINY-0007HQ-LM; Tue, 25 Jul 2023 09:47:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOIMo-0005ms-Ue; Tue, 25 Jul 2023 09:46:32 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOIMn-0001UV-DI; Tue, 25 Jul 2023 09:46:22 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0C542160F6; Tue, 25 Jul 2023 16:45:35 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id B8885194B9; Tue, 25 Jul 2023 16:45:32 +0300 (MSK) Received: (nullmailer pid 3370825 invoked by uid 1000); Tue, 25 Jul 2023 13:45:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Michael Tokarev Subject: [Stable-8.0.4 14/31] tcg: Fix info_in_idx increment in layout_arg_by_ref Date: Tue, 25 Jul 2023 16:44:59 +0300 Message-Id: <20230725134517.3370706-14-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Off by one error, failing to take into account that layout_arg_1 already incremented info_in_idx for the first piece. We only need care for the n-1 TCG_CALL_ARG_BY_REF_N pieces here. Cc: qemu-stable@nongnu.org Fixes: 313bdea84d2 ("tcg: Add TCG_CALL_{RET,ARG}_BY_REF") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1751 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Peter Maydell (cherry picked from commit e18ed26ce785f74a17e6f3a095647e08ba6fc669) Signed-off-by: Michael Tokarev diff --git a/tcg/tcg.c b/tcg/tcg.c index bb52bc060b..f3bf471274 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -732,7 +732,7 @@ static void layout_arg_by_ref(TCGCumulativeArgs *cum, TCGHelperInfo *info) .ref_slot = cum->ref_slot + i, }; } - cum->info_in_idx += n; + cum->info_in_idx += n - 1; /* i=0 accounted for in layout_arg_1 */ cum->ref_slot += n; }