| Message ID | 157851811621.1732.15187089912852035409.stgit@ubuntu3-kvm2 |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | Fixes for sockmap/tls from more complex BPF progs | expand |
On Wed, Jan 8, 2020 at 1:15 PM John Fastabend <john.fastabend@gmail.com> wrote: > > Leaving an incorrect end mark in place when passing to crypto > layer will cause crypto layer to stop processing data before > all data is encrypted. To fix clear the end mark on push > data instead of expecting users of the helper to clear the > mark value after the fact. > > This happens when we push data into the middle of a skmsg and > have room for it so we don't do a set of copies that already > clear the end flag. > > Fixes: 6fff607e2f14b ("bpf: sk_msg program helper bpf_msg_push_data") > Signed-off-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Song Liu <songliubraving@fb.com>
diff --git a/net/core/filter.c b/net/core/filter.c index 34d8eb0823f4..21d0190b5413 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2415,6 +2415,7 @@ BPF_CALL_4(bpf_msg_push_data, struct sk_msg *, msg, u32, start, sk_msg_iter_var_next(i); sg_unmark_end(psge); + sg_unmark_end(&rsge); sk_msg_iter_next(msg, end); }
Leaving an incorrect end mark in place when passing to crypto layer will cause crypto layer to stop processing data before all data is encrypted. To fix clear the end mark on push data instead of expecting users of the helper to clear the mark value after the fact. This happens when we push data into the middle of a skmsg and have room for it so we don't do a set of copies that already clear the end flag. Fixes: 6fff607e2f14b ("bpf: sk_msg program helper bpf_msg_push_data") Signed-off-by: John Fastabend <john.fastabend@gmail.com> --- net/core/filter.c | 1 + 1 file changed, 1 insertion(+)