xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tls: take into account that bpf_exec_tx_verdict() may free the record

Browse Source 
bpf_exec_tx_verdict() may free the record if tls_push_record()
fails, or if the entire record got consumed by BPF. Re-check
ctx->open_rec before touching the data.

Fixes: d3b18ad31f ("tls: add bpf support to sk_msg handling")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2019-11-27 12:16:39 -08:00
committed by David S. Miller
parent 81b6b96475
commit c329ef9684
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/tls/tls_sw.c
View File

@@ -984,7 +984,7 @@ alloc_encrypted:
num_async++; num_async++;
else if (ret == -ENOMEM) else if (ret == -ENOMEM)
goto wait_for_memory; goto wait_for_memory;
else if (ret == -ENOSPC) else if (ctx->open_rec && ret == -ENOSPC)
goto rollback_iter; goto rollback_iter;
else if (ret != -EAGAIN) else if (ret != -EAGAIN)
goto send_end; goto send_end;
@@ -1053,11 +1053,12 @@ wait_for_memory:
ret = sk_stream_wait_memory(sk, &timeo); ret = sk_stream_wait_memory(sk, &timeo);
if (ret) { if (ret) {
trim_sgl: trim_sgl:
if (ctx->open_rec)
tls_trim_both_msgs(sk, orig_size); tls_trim_both_msgs(sk, orig_size);
goto send_end; goto send_end;
} }
if (msg_en->sg.size < required_size) if (ctx->open_rec && msg_en->sg.size < required_size)
goto alloc_encrypted; goto alloc_encrypted;
} }
@@ -1190,10 +1191,12 @@ wait_for_sndbuf:
wait_for_memory: wait_for_memory:
ret = sk_stream_wait_memory(sk, &timeo); ret = sk_stream_wait_memory(sk, &timeo);
if (ret) { if (ret) {
if (ctx->open_rec)
tls_trim_both_msgs(sk, msg_pl->sg.size); tls_trim_both_msgs(sk, msg_pl->sg.size);
goto sendpage_end; goto sendpage_end;
} }
if (ctx->open_rec)
goto alloc_payload; goto alloc_payload;
} }