From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AC25C32756 for ; Mon, 5 Aug 2019 13:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3804A214C6 for ; Mon, 5 Aug 2019 13:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011215; bh=bS4lx0ry0VHyABzUcyin0lYg1NGXOBcP1K0RdrUjRn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oY/goK25MsJCFvm9XhMjDCbhBcNaZjiP5+2g4JWAX49gAQfIKHe9iJCCebtZsUeK0 q5Q0xP6tsTozmyaS0+dpJsSNWYT8MNATRtY+OZHELVJMIzz/e7irkzttr9Cnd9dFLT 15gZaLtMO6TdYSaSdQBWHCCZGn1WW2dBS6PCt140= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728852AbfHENUB (ORCPT ); Mon, 5 Aug 2019 09:20:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730121AbfHENUB (ORCPT ); Mon, 5 Aug 2019 09:20:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 850FC20657; Mon, 5 Aug 2019 13:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011200; bh=bS4lx0ry0VHyABzUcyin0lYg1NGXOBcP1K0RdrUjRn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ajbFF6kuhjfRR2VeD0pa2vKAv0JqExBU3PS9GiuFr7n0CWruLsrmJXE21Bxo9rGGX EEidS08hOFeVk6m22PvC0Nx6csroPbijKdTVMD6NeFI560vq7TsRmA0wtdVCFtu7zi ORGAq+jNDdkad7c30CB7Hm+SDPXIyVbQwBw377lo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Will Deacon Subject: [PATCH 4.19 58/74] arm64: compat: Allow single-byte watchpoints on all addresses Date: Mon, 5 Aug 2019 15:03:11 +0200 Message-Id: <20190805124940.553177054@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124935.819068648@linuxfoundation.org> References: <20190805124935.819068648@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 849adec41203ac5837c40c2d7e08490ffdef3c2c upstream. Commit d968d2b801d8 ("ARM: 7497/1: hw_breakpoint: allow single-byte watchpoints on all addresses") changed the validation requirements for hardware watchpoints on arch/arm/. Update our compat layer to implement the same relaxation. Cc: Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/hw_breakpoint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -547,13 +547,14 @@ int hw_breakpoint_arch_parse(struct perf /* Aligned */ break; case 1: - /* Allow single byte watchpoint. */ - if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) - break; case 2: /* Allow halfword watchpoints and breakpoints. */ if (hw->ctrl.len == ARM_BREAKPOINT_LEN_2) break; + case 3: + /* Allow single byte watchpoint. */ + if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) + break; default: return -EINVAL; }