From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 20 Aug 2019 16:30:46 +0000 (-0700)
Subject: 4.4-stable patches
X-Git-Tag: v4.19.68~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e043a3ea3970315a12d30cfa688ae052b66836f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch
---

diff --git a/queue-4.4/arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch b/queue-4.4/arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch
new file mode 100644
index 00000000000..5912eaf6317
--- /dev/null
+++ b/queue-4.4/arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch
@@ -0,0 +1,42 @@
+From 849adec41203ac5837c40c2d7e08490ffdef3c2c Mon Sep 17 00:00:00 2001
+From: Will Deacon <will@kernel.org>
+Date: Mon, 29 Jul 2019 11:06:17 +0100
+Subject: arm64: compat: Allow single-byte watchpoints on all addresses
+
+From: Will Deacon <will@kernel.org>
+
+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: <stable@vger.kernel.org>
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -504,13 +504,14 @@ int arch_validate_hwbkpt_settings(struct
+ 			/* Aligned */
+ 			break;
+ 		case 1:
+-			/* Allow single byte watchpoint. */
+-			if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)
+-				break;
+ 		case 2:
+ 			/* Allow halfword watchpoints and breakpoints. */
+ 			if (info->ctrl.len == ARM_BREAKPOINT_LEN_2)
+ 				break;
++		case 3:
++			/* Allow single byte watchpoint. */
++			if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)
++				break;
+ 		default:
+ 			return -EINVAL;
+ 		}
diff --git a/queue-4.4/series b/queue-4.4/series
index cd9823f972c..deaed90ad83 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -63,3 +63,4 @@ usb-serial-option-add-the-broadmobi-bm818-card.patch
 usb-serial-option-add-motorola-modem-uarts.patch
 backport-minimal-compiler_attributes.h-to-support-gc.patch
 include-linux-module.h-copy-__init-__exit-attrs-to-i.patch
+arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch