From patchwork Wed Apr 22 04:32:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 185656 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp296998ilf; Tue, 21 Apr 2020 21:33:46 -0700 (PDT) X-Google-Smtp-Source: APiQypL3bGoaDGMqGDX89433PfVFCRw6/CJmy4TDSc12CABXNPNHT2LdhiH8my/gl6X7lzmQBHO8 X-Received: by 2002:ac8:4e88:: with SMTP id 8mr24692368qtp.82.1587530026507; Tue, 21 Apr 2020 21:33:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587530026; cv=none; d=google.com; s=arc-20160816; b=ooqtY7T3Vg+5qbM1S0jzzPLzJ78cNoF2BFNGgJUY1IgoYClTBUBOun9BUUTo8HTwYa URi04oJnWKGPkj0kKudWCSvxSWvwtoLRUYAvdktSKsVvCUIgnSGH8vs/4Z5P+/DfELsc VRbsjs4EWWn49AQ8Pq65Hwvt7Li8AACGA7ASMtnVZ2jGdUylwLm2sgXQzuw/rj8nMAmC MZ1W/on6iPQWA/pyT0Z8Ke8vZ4dbJtgriBG1NuluvKmCPc4vajPrKvvsxKojs+8fFTt2 jtnazFRgaP/75voKcSTEahMVwzEZIpfV41qLNIFB/I9laHl1sdbYKKr9erLVosqIKacF NtKg== 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=iKZvtr9IPAzyq9GBvX8e6ybeQtJDWGAh30ejEfYLqNo=; b=nUnC1JTWKLi0HaujGbwXhtNVed+VJyf7BWTDxjstLARpLUVsfqigdJWIlDV+/WgNZq Q+yEFkjbcB1ni98kYTO5REIX3n0qYC/em4dXFFikCuOCWSIWQKFX/1BVUMIvPSDlp+T9 kI6Os5OD7z47sMnPeuBZFSfmG7moIcsDqW8Q69bTxbS91mDOGat/4QLV1ye5qGMuaf4z ThdH7nDbSdNjN1s25xZpxE2jzCYAYtqtoO+ErO0V3H2QJxSK1DHc6LCdvVzVgSzUHuvT 2wF+FKMAUTFHnfRJA29DOzKlRC2Z9NE3+jPi3lqcLy6AtCiaIJpZZSSJ7AoldT5+l34T 8jLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O8YdVlUF; 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=pass (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 b16si2415120qvk.183.2020.04.21.21.33.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Apr 2020 21:33: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; dkim=pass header.i=@linaro.org header.s=google header.b=O8YdVlUF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR74z-0000qt-Sw for patch@linaro.org; Wed, 22 Apr 2020 00:33:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR74X-0000PO-0I for qemu-devel@nongnu.org; Wed, 22 Apr 2020 00:33:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jR74W-0004g3-4W for qemu-devel@nongnu.org; Wed, 22 Apr 2020 00:33:16 -0400 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:34975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jR74V-0004c7-Nd for qemu-devel@nongnu.org; Wed, 22 Apr 2020 00:33:15 -0400 Received: by mail-pj1-x1041.google.com with SMTP id ms17so378984pjb.0 for ; Tue, 21 Apr 2020 21:33:15 -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=iKZvtr9IPAzyq9GBvX8e6ybeQtJDWGAh30ejEfYLqNo=; b=O8YdVlUFMeAyiQckNOrUjTA+kG9wxt/Vpotnkg7s2jSHuklfDef4zCNAvnL92Kigk9 /YcwhcFjzqs7MJlzEy+8erOYdtH/uYgiWm60rrvtmf1M2rAzGQqJQTtQvXAw9JbgpUHE cw4CI0vWTkGYmmsVrve8uUfTWPLHT33mmXnmPdqIBsw3gXBbPrRwGx8Wo8fjLZzAg9R/ EewiN/3oJH4I0oSwcEs0aTyDlJ16LOQSgE6q0OHnfPwafr8yX6Mb2dde1AzkvfNqgckp spvobVVvQHyo1JF1wa3lsT9ANXCRqJPfmTxyIOdSR5+MZXGfpHUtMFF+9IY4+Bd5iWuF 2ZRg== 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=iKZvtr9IPAzyq9GBvX8e6ybeQtJDWGAh30ejEfYLqNo=; b=cZ7nUdH8Bp9WxqumKcqMtVXTJjSmTyZoK0VvrQcxGNw/u4iRaG+HBKz47OBypXQJAl jggbjWwTpVF+pAheMniyhjlefjld8gdHgOHVlsF9kUpXi+UfQ+olsF03O+28Qk2D7PG7 1IwYtUhpcToH4aytpButDs3fbkx8WMB18F+RmH88RZuLuh8lsZ6pkOawyxRwKvsIqX3C qRLp736+x3YlPrLuvU9yji+nxvX8YWCnKF6olnlqh598V1aaD603MJgMUrSJQW1llIhm jtlBFasV7cANuvxr/48d1lEZTLBBxxsNs8e5MvnSNice363LsrL8l1AxXoXVtLuovaE7 dFbg== X-Gm-Message-State: AGi0PuYBPqD8tr72Rhex55aKDM+TsFZLodA4ZM74JUvgnYefKAJAuBkT JEsSy2pRO4nsH475XT76V815270kyh0= X-Received: by 2002:a17:902:d201:: with SMTP id t1mr3566571ply.328.1587529993856; Tue, 21 Apr 2020 21:33:13 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id l137sm4129613pfd.107.2020.04.21.21.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 21:33:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/18] exec: Fix cpu_watchpoint_address_matches address length Date: Tue, 21 Apr 2020 21:32:53 -0700 Message-Id: <20200422043309.18430-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200422043309.18430-1-richard.henderson@linaro.org> References: <20200422043309.18430-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1041; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1041.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2607:f8b0:4864:20::1041 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, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The only caller of cpu_watchpoint_address_matches passes TARGET_PAGE_SIZE, so the bug is not currently visible. Signed-off-by: Richard Henderson --- exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Peter Maydell diff --git a/exec.c b/exec.c index 2874bb5088..5162f0d12f 100644 --- a/exec.c +++ b/exec.c @@ -1127,7 +1127,7 @@ int cpu_watchpoint_address_matches(CPUState *cpu, vaddr addr, vaddr len) int ret = 0; QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) { - if (watchpoint_address_matches(wp, addr, TARGET_PAGE_SIZE)) { + if (watchpoint_address_matches(wp, addr, len)) { ret |= wp->flags; } }