4.17-stable review patch. If anyone has any objections, please let me know.
------------------ From: Doron Roberts-Kedes <[email protected]> [ Upstream commit 52ee6ef36ee10dd493cf2067311e56ca8015eb8d ] The current code does not inspect the return value of skb_to_sgvec. This can cause a nullptr kernel panic when the malformed sgvec is passed into the crypto request. Checking the return value of skb_to_sgvec and skipping decryption if it is negative fixes this problem. Fixes: c46234ebb4d1 ("tls: RX path for ktls") Acked-by: Dave Watson <[email protected]> Signed-off-by: Doron Roberts-Kedes <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- net/tls/tls_sw.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -705,6 +705,10 @@ static int decrypt_skb(struct sock *sk, nsg = skb_to_sgvec(skb, &sgin[1], rxm->offset + tls_ctx->rx.prepend_size, rxm->full_len - tls_ctx->rx.prepend_size); + if (nsg < 0) { + ret = nsg; + goto out; + } tls_make_aad(ctx->rx_aad_ciphertext, rxm->full_len - tls_ctx->rx.overhead_size, @@ -716,6 +720,7 @@ static int decrypt_skb(struct sock *sk, rxm->full_len - tls_ctx->rx.overhead_size, skb, sk->sk_allocation); +out: if (sgin != &sgin_arr[0]) kfree(sgin);
