From: Alexei Starovoitov <ast@kernel.org>
Date: Sun, 6 Jan 2019 05:32:39 +0000 (-0800)
Subject: Merge branch 'reject-ptr-scalar-mix'
X-Git-Tag: v5.0-rc3~39^2~24^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=97274b6126193cca2b820579f5d758589a2badc2;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'reject-ptr-scalar-mix'

Daniel Borkmann says:

====================
Follow-up fix to 979d63d50c0c ("bpf: prevent out of bounds speculation
on pointer arithmetic") in order to reject a corner case for sanitation
when ptr / scalars are mixed in the same alu op.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

97274b6126193cca2b820579f5d758589a2badc2