stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: daniel@iogearbox.net, ast@kernel.org, gregkh@linuxfoundation.org,
	jannh@google.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "[PATCH stable/4.14 11/14] bpf: force strict alignment checks for stack pointers" has been added to the 4.14-stable tree
Date: Fri, 22 Dec 2017 16:47:45 +0100	[thread overview]
Message-ID: <1513957665150214@kroah.com> (raw)
In-Reply-To: <20171222152312.2945-12-daniel@iogearbox.net>


This is a note to let you know that I've just added the patch titled

    [PATCH stable/4.14 11/14] bpf: force strict alignment checks for stack pointers

to the 4.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bpf-force-strict-alignment-checks-for-stack-pointers.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Fri Dec 22 16:47:02 CET 2017
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 22 Dec 2017 16:23:09 +0100
Subject: [PATCH stable/4.14 11/14] bpf: force strict alignment checks for stack pointers
To: gregkh@linuxfoundation.org
Cc: ast@kernel.org, daniel@iogearbox.net, jannh@google.com, stable@vger.kernel.org
Message-ID: <20171222152312.2945-12-daniel@iogearbox.net>

From: Daniel Borkmann <daniel@iogearbox.net>


From: Jann Horn <jannh@google.com>

[ Upstream commit a5ec6ae161d72f01411169a938fa5f8baea16e8f ]

Force strict alignment checks for stack pointers because the tracking of
stack spills relies on it; unaligned stack accesses can lead to corruption
of spilled registers, which is exploitable.

Fixes: f1174f77b50c ("bpf/verifier: rework value tracking")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 kernel/bpf/verifier.c |    5 +++++
 1 file changed, 5 insertions(+)

--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1061,6 +1061,11 @@ static int check_ptr_alignment(struct bp
 		break;
 	case PTR_TO_STACK:
 		pointer_desc = "stack ";
+		/* The stack spill tracking logic in check_stack_write()
+		 * and check_stack_read() relies on stack accesses being
+		 * aligned.
+		 */
+		strict = true;
 		break;
 	default:
 		break;


Patches currently in stable-queue which might be from daniel@iogearbox.net are

queue-4.14/bpf-fix-integer-overflows.patch
queue-4.14/bpf-fix-branch-pruning-logic.patch
queue-4.14/bpf-s390x-do-not-reload-skb-pointers-in-non-skb-context.patch
queue-4.14/bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-after-call.patch
queue-4.14/bpf-fix-incorrect-tracking-of-register-size-truncation.patch
queue-4.14/bpf-don-t-prune-branches-when-a-scalar-is-replaced-with-a-pointer.patch
queue-4.14/bpf-verifier-fix-bounds-calculation-on-bpf_rsh.patch
queue-4.14/selftests-bpf-add-tests-for-recent-bugfixes.patch
queue-4.14/bpf-fix-corruption-on-concurrent-perf_event_output-calls.patch
queue-4.14/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch
queue-4.14/bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-context.patch
queue-4.14/bpf-fix-missing-error-return-in-check_stack_boundary.patch
queue-4.14/bpf-force-strict-alignment-checks-for-stack-pointers.patch
queue-4.14/bpf-fix-32-bit-alu-op-verification.patch
queue-4.14/bpf-fix-build-issues-on-um-due-to-mising-bpf_perf_event.h.patch

  reply	other threads:[~2017-12-22 15:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-22 15:22 [PATCH stable/4.14 00/14] BPF stable patches for 4.14 Daniel Borkmann
2017-12-22 15:22 ` [PATCH stable/4.14 01/14] bpf: fix branch pruning logic Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 01/14] bpf: fix branch pruning logic" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 02/14] bpf: fix corruption on concurrent perf_event_output calls Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 02/14] bpf: fix corruption on concurrent perf_event_output calls" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 03/14] bpf, s390x: do not reload skb pointers in non-skb context Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 03/14] bpf, s390x: do not reload skb pointers in non-skb context" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 04/14] bpf, ppc64: do not reload skb pointers in non-skb context Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 04/14] bpf, ppc64: do not reload skb pointers in non-skb context" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 05/14] bpf, sparc: fix usage of wrong reg for load_skb_regs after call Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 05/14] bpf, sparc: fix usage of wrong reg for load_skb_regs after call" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 06/14] bpf/verifier: fix bounds calculation on BPF_RSH Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 06/14] bpf/verifier: fix bounds calculation on BPF_RSH" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 07/14] bpf: fix incorrect sign extension in check_alu_op() Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 07/14] bpf: fix incorrect sign extension in check_alu_op()" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 08/14] bpf: fix incorrect tracking of register size truncation Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 08/14] bpf: fix incorrect tracking of register size truncation" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 09/14] bpf: fix 32-bit ALU op verification Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 09/14] bpf: fix 32-bit ALU op verification" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 10/14] bpf: fix missing error return in check_stack_boundary() Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 10/14] bpf: fix missing error return in check_stack_boundary()" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 11/14] bpf: force strict alignment checks for stack pointers Daniel Borkmann
2017-12-22 15:47   ` gregkh [this message]
2017-12-22 15:23 ` [PATCH stable/4.14 12/14] bpf: don't prune branches when a scalar is replaced with a pointer Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 12/14] bpf: don't prune branches when a scalar is replaced with a pointer" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 13/14] bpf: fix integer overflows Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 13/14] bpf: fix integer overflows" has been added to the 4.14-stable tree gregkh
2017-12-22 15:23 ` [PATCH stable/4.14 14/14] selftests/bpf: add tests for recent bugfixes Daniel Borkmann
2017-12-22 15:47   ` Patch "[PATCH stable/4.14 14/14] selftests/bpf: add tests for recent bugfixes" has been added to the 4.14-stable tree gregkh
2017-12-22 15:45 ` [PATCH stable/4.14 00/14] BPF stable patches for 4.14 Greg KH
2017-12-22 15:48   ` Greg KH
2017-12-22 15:51 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513957665150214@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=jannh@google.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).