Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a976384b authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

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: e8f69799 ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d412d87

net/tls/tls_device_fallback.c

+2 −1
Original line number Diff line number Diff line
@@ -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));