diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:59 +0100 |
| commit | 4ee0feccf2b372134d899a01ee025739f4ddfdca (patch) | |
| tree | 8e63340fed636fb7334c61042bc364375b4d2be7 /net/tipc/crypto.c | |
| parent | 71ee2a4f95e205bd33e79c7bd4bece3885e0e366 (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
spi: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'net/tipc/crypto.c')
| -rw-r--r-- | net/tipc/crypto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c index 577fa5af33ec..302fd749c424 100644 --- a/net/tipc/crypto.c +++ b/net/tipc/crypto.c @@ -1960,7 +1960,8 @@ rcv: skb_reset_network_header(*skb); skb_pull(*skb, tipc_ehdr_size(ehdr)); - pskb_trim(*skb, (*skb)->len - aead->authsize); + if (pskb_trim(*skb, (*skb)->len - aead->authsize)) + goto free_skb; /* Validate TIPCv2 message */ if (unlikely(!tipc_msg_validate(skb))) { |