leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/tls: check return values from skb_copy_bits() and skb_store_bits()

Browse Source 
In light of recent bugs, we should make a better effort of
checking return values.  In theory none of the functions should
fail today.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2019-06-03 15:16:59 -07:00 committed by David S. Miller
parent da29e4b466
commit aeb11ff0dc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/tls/tls_device.c
View File

@ -603,8 +603,10 @@ static int tls_device_reencrypt(struct sock *sk, struct sk_buff *skb)
sg_set_buf(&sg[0], buf, sg_set_buf(&sg[0], buf,
rxm->full_len + TLS_HEADER_SIZE + rxm->full_len + TLS_HEADER_SIZE +
TLS_CIPHER_AES_GCM_128_IV_SIZE); TLS_CIPHER_AES_GCM_128_IV_SIZE);
skb_copy_bits(skb, offset, buf, err = skb_copy_bits(skb, offset, buf,
TLS_HEADER_SIZE + TLS_CIPHER_AES_GCM_128_IV_SIZE); TLS_HEADER_SIZE + TLS_CIPHER_AES_GCM_128_IV_SIZE);
if (err)
goto free_buf;
/* We are interested only in the decrypted data not the auth */ /* We are interested only in the decrypted data not the auth */
err = decrypt_skb(sk, skb, sg); err = decrypt_skb(sk, skb, sg);
@ -618,8 +620,11 @@ static int tls_device_reencrypt(struct sock *sk, struct sk_buff *skb)
if (skb_pagelen(skb) > offset) { if (skb_pagelen(skb) > offset) {
copy = min_t(int, skb_pagelen(skb) - offset, data_len); copy = min_t(int, skb_pagelen(skb) - offset, data_len);
if (skb->decrypted) if (skb->decrypted) {
skb_store_bits(skb, offset, buf, copy); err = skb_store_bits(skb, offset, buf, copy);
if (err)
goto free_buf;
}
offset += copy; offset += copy;
buf += copy; buf += copy;
@ -642,8 +647,11 @@ static int tls_device_reencrypt(struct sock *sk, struct sk_buff *skb)
copy = min_t(int, skb_iter->len - frag_pos, copy = min_t(int, skb_iter->len - frag_pos,
data_len + rxm->offset - offset); data_len + rxm->offset - offset);
if (skb_iter->decrypted) if (skb_iter->decrypted) {
skb_store_bits(skb_iter, frag_pos, buf, copy); err = skb_store_bits(skb_iter, frag_pos, buf, copy);
if (err)
goto free_buf;
}
offset += copy; offset += copy;
buf += copy; buf += copy;