diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-05 17:03:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-05 17:03:05 -0700 |
| commit | 527c0cc61d8400a0002579cdd8c0362c6f44d09d (patch) | |
| tree | 5eadc4509a117b6a0f37e31b14adb1605fc73007 | |
| parent | 93273f5d8ace9bc03f0dc35ea98d229ed40f7860 (diff) | |
| download | patches-527c0cc61d8400a0002579cdd8c0362c6f44d09d.tar.gz | |
signed-off-by
6 files changed, 7 insertions, 14 deletions
diff --git a/drivers-uio-un-restrict-sysfs-pointers-for-uio.patch b/drivers-uio-un-restrict-sysfs-pointers-for-uio.patch index 7223ab865eef62..d8d5bc825222e6 100644 --- a/drivers-uio-un-restrict-sysfs-pointers-for-uio.patch +++ b/drivers-uio-un-restrict-sysfs-pointers-for-uio.patch @@ -1,13 +1,11 @@ From: Chris Fries <cfries@google.com> -Date: Thu, 27 Apr 2017 23:30:55 -0500 Subject: drivers: uio: Un-restrict sysfs pointers for UIO The addr and size on the UIO devices are required by userspace to function properly. Let's unrestrict these by adding the 'P' modifier to %p and %pa. Signed-off-by: Chris Fries <cfries@google.com> ---- - +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/uio/uio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-vsprintf-add-pap-padp-options.patch b/lib-vsprintf-add-pap-padp-options.patch index 1e20d375c4a032..a34cdf978b52d9 100644 --- a/lib-vsprintf-add-pap-padp-options.patch +++ b/lib-vsprintf-add-pap-padp-options.patch @@ -1,13 +1,11 @@ From: Chris Fries <cfries@google.com> -Date: Thu, 27 Apr 2017 23:29:40 -0500 Subject: lib: vsprintf: Add "%paP", "%padP" options Add %paP and %padP for physical address that need to always be shown regardless of kptr restrictions. Signed-off-by: Chris Fries <cfries@google.com> ---- - +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Documentation/printk-formats.txt | 10 ++++++---- lib/vsprintf.c | 12 +++++++++--- diff --git a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch index 4a06692e178438..b7d93ff4d63cd9 100644 --- a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch +++ b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch @@ -1,5 +1,4 @@ From: Dave Weinstein <olorin@google.com> -Date: Wed, 11 Jan 2017 15:39:07 -0800 Subject: lib: vsprintf: additional kernel pointer filtering options Add the kptr_restrict setting of 3 which results in both @@ -11,7 +10,9 @@ option which explicitly whitelists pointers for output. This patch is based on work by William Roberts <william.c.roberts@intel.com> +Cc: William Roberts <william.c.roberts@intel.com> Signed-off-by: Dave Weinstein <olorin@google.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Documentation/printk-formats.txt | 5 ++ diff --git a/lib-vsprintf-default-kptr_restrict-to-the-maximum-value.patch b/lib-vsprintf-default-kptr_restrict-to-the-maximum-value.patch index e247b29c635926..7b2dafe2edd075 100644 --- a/lib-vsprintf-default-kptr_restrict-to-the-maximum-value.patch +++ b/lib-vsprintf-default-kptr_restrict-to-the-maximum-value.patch @@ -1,5 +1,4 @@ From: Dave Weinstein <olorin@google.com> -Date: Wed, 11 Jan 2017 16:27:59 -0800 Subject: lib: vsprintf: default kptr_restrict to the maximum value Set the initial value of kptr_restrict to the maximum @@ -7,8 +6,7 @@ setting rather than the minimum setting, to ensure that early boot logging is not leaking information. Signed-off-by: Dave Weinstein <olorin@google.com> ---- - +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch index 47d3c8f520c257..dfc85e37c2fe6d 100644 --- a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch +++ b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch @@ -1,13 +1,11 @@ From: Dave Weinstein <olorin@google.com> -Date: Wed, 11 Jan 2017 16:13:09 -0800 Subject: lib: vsprintf: physical address kernel pointer filtering options Add the kptr_restrict setting of 4 which results in %pa and %p[rR] values being replaced by zeros. Signed-off-by: Dave Weinstein <olorin@google.com> ---- - +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Documentation/sysctl/kernel.txt | 8 +++++++- kernel/sysctl.c | 3 +-- diff --git a/lib-vsprintf-whitelist-stack-traces.patch b/lib-vsprintf-whitelist-stack-traces.patch index eeee7bd64b02ac..392cea6c493fab 100644 --- a/lib-vsprintf-whitelist-stack-traces.patch +++ b/lib-vsprintf-whitelist-stack-traces.patch @@ -1,11 +1,11 @@ From: Dave Weinstein <olorin@google.com> -Date: Wed, 11 Jan 2017 16:02:44 -0800 Subject: lib: vsprintf: whitelist stack traces Use the %pP functionality to explicitly allow kernel pointers to be logged for stack traces Signed-off-by: Dave Weinstein <olorin@google.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/arm64/kernel/traps.c | 4 ++-- |