diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-04-29 12:19:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-05 14:42:38 +0200 |
| commit | a976384b955370e148c462e43f1a13400e33c24a (patch) | |
| tree | b1c19a792729324a2478ecaa946d61c18fb55af1 | |
| parent | 1d412d873a12f5d7aa1d8ef1792f330a5e0a27c2 (diff) | |
| download | linux-a976384b955370e148c462e43f1a13400e33c24a.tar.gz linux-a976384b955370e148c462e43f1a13400e33c24a.tar.bz2 linux-a976384b955370e148c462e43f1a13400e33c24a.zip | |
net/tls: avoid NULL pointer deref on nskb->sk in fallback
[ Upstream commit 2dcb003314032c6efb13a065ffae60d164b2dd35 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/tls/tls_device_fallback.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c index ef8934fd8698..426dd97725e4 100644 --- a/net/tls/tls_device_fallback.c +++ b/net/tls/tls_device_fallback.c @@ -200,13 +200,14 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln) skb_put(nskb, skb->len); memcpy(nskb->data, skb->data, headln); - update_chksum(nskb, headln); nskb->destructor = skb->destructor; nskb->sk = sk; skb->destructor = NULL; skb->sk = NULL; + update_chksum(nskb, headln); + delta = nskb->truesize - skb->truesize; if (likely(delta < 0)) WARN_ON_ONCE(refcount_sub_and_test(-delta, &sk->sk_wmem_alloc)); |