aboutsummaryrefslogtreecommitdiffstats
path: root/net/tls/tls_device_fallback.c
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2019-04-29 15:19:12 -0400
committerDavid S. Miller <davem@davemloft.net>2019-05-01 11:37:56 -0400
commit2dcb003314032c6efb13a065ffae60d164b2dd35 (patch)
treeb64c7ba4758ecae0346158cf8b828c222ead460a /net/tls/tls_device_fallback.c
parent15d55bae4e3c43cd9f87fd93c73a263e172d34e1 (diff)
net/tls: avoid NULL pointer deref on nskb->sk in fallback
update_chksum() accesses nskb->sk before it has been set by complete_skb(), move the init up. Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls/tls_device_fallback.c')
-rw-r--r--net/tls/tls_device_fallback.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c
index a3ebd4b02714..c3a5fe624b4e 100644
--- a/net/tls/tls_device_fallback.c
+++ b/net/tls/tls_device_fallback.c
@@ -201,13 +201,14 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln)
201 201
202 skb_put(nskb, skb->len); 202 skb_put(nskb, skb->len);
203 memcpy(nskb->data, skb->data, headln); 203 memcpy(nskb->data, skb->data, headln);
204 update_chksum(nskb, headln);
205 204
206 nskb->destructor = skb->destructor; 205 nskb->destructor = skb->destructor;
207 nskb->sk = sk; 206 nskb->sk = sk;
208 skb->destructor = NULL; 207 skb->destructor = NULL;
209 skb->sk = NULL; 208 skb->sk = NULL;
210 209
210 update_chksum(nskb, headln);
211
211 delta = nskb->truesize - skb->truesize; 212 delta = nskb->truesize - skb->truesize;
212 if (likely(delta < 0)) 213 if (likely(delta < 0))
213 WARN_ON_ONCE(refcount_sub_and_test(-delta, &sk->sk_wmem_alloc)); 214 WARN_ON_ONCE(refcount_sub_and_test(-delta, &sk->sk_wmem_alloc));