add bpf changelog comment update for 4.14.y

diff --git a/queue-4.14/bpf-fix-selftests-are-changes-for-cve-2019-7308.patch b/queue-4.14/bpf-fix-selftests-are-changes-for-cve-2019-7308.patch
index 6aec81af4515eb626b7a96c84ea222c1c6ff700e..cf9953eb43ef24abe969594336a4986a527c9f3b 100644 (file)
--- a/queue-4.14/bpf-fix-selftests-are-changes-for-cve-2019-7308.patch
+++ b/queue-4.14/bpf-fix-selftests-are-changes-for-cve-2019-7308.patch
@@ -8,7 +8,10 @@ Message-ID: <20190403183917.13749-18-sblbir@amzn.com>
 
 From: Balbir Singh <sblbir@amzn.com>
 
-The error strings need to be updated, since they fail early.
+The changes to fix the CVE 2019-7308 make the bpf verifier stricter
+with respect to operations that were allowed earlier in unprivileged
+mode. Fixup the test cases so that the error messages now correctly
+reflect pointer arithmetic going out of range for tests.
 
 Signed-off-by: Balbir Singh <sblbir@amzn.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/queue-4.4/include-linux-swap.h-use-offsetof-instead-of-custom-.patch b/queue-4.4/include-linux-swap.h-use-offsetof-instead-of-custom-.patch
index 5cd3b69ee934d5950761f9ee751813ba31edaeda..b1293bb561dc82c98a950212df1a5e8d63d562f9 100644 (file)
--- a/queue-4.4/include-linux-swap.h-use-offsetof-instead-of-custom-.patch
+++ b/queue-4.4/include-linux-swap.h-use-offsetof-instead-of-custom-.patch
@@ -35,11 +35,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- include/linux/swap.h | 4 ++--
+ include/linux/swap.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/include/linux/swap.h b/include/linux/swap.h
-index d8ca2eaa3a8b..0a0b7529dae4 100644
 --- a/include/linux/swap.h
 +++ b/include/linux/swap.h
 @@ -135,9 +135,9 @@ struct swap_extent {
@@ -54,6 +52,3 @@ index d8ca2eaa3a8b..0a0b7529dae4 100644
  
  enum {
        SWP_USED        = (1 << 0),     /* is slot in swap_info[] used? */
--- 
-2.19.1
-