| Message ID | 20230725064810.5820-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e46e06ffc6d667a89b979701288e2264f45e6a7b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/1] tipc: check return value of pskb_trim() | expand |
>Subject: [PATCH v2 1/1] tipc: check return value of pskb_trim() > >goto free_skb if an unexpected result is returned by pskb_tirm() in tipc_crypto_rcv_complete(). > >Fixes: fc1b6d6de220 ("tipc: introduce TIPC encryption & authentication") >Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> >--- > net/tipc/crypto.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >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 @@ static void tipc_crypto_rcv_complete(struct net *net, struct tipc_aead *aead, > > 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))) { >-- >2.17.1 > Reviewed-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Tue, 25 Jul 2023 14:48:10 +0800 you wrote: > goto free_skb if an unexpected result is returned by pskb_tirm() > in tipc_crypto_rcv_complete(). > > Fixes: fc1b6d6de220 ("tipc: introduce TIPC encryption & authentication") > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > net/tipc/crypto.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Here is the summary with links: - [v2,1/1] tipc: check return value of pskb_trim() https://git.kernel.org/netdev/net/c/e46e06ffc6d6 You are awesome, thank you!
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 @@ static void tipc_crypto_rcv_complete(struct net *net, struct tipc_aead *aead, 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))) {
goto free_skb if an unexpected result is returned by pskb_tirm() in tipc_crypto_rcv_complete(). Fixes: fc1b6d6de220 ("tipc: introduce TIPC encryption & authentication") Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> --- net/tipc/crypto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)