diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-16 17:47:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-16 17:47:03 -0700 |
| commit | 0376d5dce0aa174e5e4cd8b8644a9ea40b9657f9 (patch) | |
| tree | 34f587fc2cf619a587e323c52b53338f97636439 /net | |
| parent | 4bf9ffa0fb5744ed40d7348c24fa9ae398b1d603 (diff) | |
| parent | 4c3d795cb012a378855543a775408fba1ccff6f2 (diff) | |
| download | linux-stable-0376d5dce0aa174e5e4cd8b8644a9ea40b9657f9.tar.gz linux-stable-0376d5dce0aa174e5e4cd8b8644a9ea40b9657f9.tar.bz2 linux-stable-0376d5dce0aa174e5e4cd8b8644a9ea40b9657f9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-09-16
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix end boundary calculation in BTF for the type section, from Martin.
2) Fix and revert subtraction of pointers that was accidentally allowed
for unprivileged programs, from Alexei.
3) Fix bpf_msg_pull_data() helper by using __GFP_COMP in order to avoid
a warning in linearizing sg pages into a single one for large allocs,
from Tushar.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/filter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index aecdeba052d3..5e00f2b85a56 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2344,7 +2344,8 @@ BPF_CALL_4(bpf_msg_pull_data, if (unlikely(bytes_sg_total > copy)) return -EINVAL; - page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC, get_order(copy)); + page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC | __GFP_COMP, + get_order(copy)); if (unlikely(!page)) return -ENOMEM; p = page_address(page); |