From 40b9dbe8abddc89f6679b5025690a2f059ebbee0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Apr 2019 09:24:38 +0200 Subject: [PATCH] add bpf changelog comment update for 4.14.y --- .../bpf-fix-selftests-are-changes-for-cve-2019-7308.patch | 5 ++++- ...lude-linux-swap.h-use-offsetof-instead-of-custom-.patch | 7 +------ 2 files changed, 5 insertions(+), 7 deletions(-) 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 6aec81af45..cf9953eb43 100644 --- 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 -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 Signed-off-by: Greg Kroah-Hartman 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 5cd3b69ee9..b1293bb561 100644 --- 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 Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - 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 - -- 2.39.2