* [PATCH] net: ipv6: fix return value check in esp_remove_trailer
@ 2023-10-07 0:59 Ma Ke
2023-10-08 17:07 ` Cong Wang
2023-10-13 5:55 ` Steffen Klassert
0 siblings, 2 replies; 5+ messages in thread
From: Ma Ke @ 2023-10-07 0:59 UTC (permalink / raw)
To: steffen.klassert, herbert, davem, dsahern, edumazet, kuba, pabeni
Cc: netdev, linux-kernel, Ma Ke
In esp_remove_trailer(), to avoid an unexpected result returned by
pskb_trim, we should check the return value of pskb_trim().
Signed-off-by: Ma Ke <make_ruc2021@163.com>
---
net/ipv6/esp6.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index fddd0cbdede1..e023d29e919c 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -770,7 +770,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb)
skb->csum = csum_block_sub(skb->csum, csumdiff,
skb->len - trimlen);
}
- pskb_trim(skb, skb->len - trimlen);
+ ret = pskb_trim(skb, skb->len - trimlen);
+ if (unlikely(ret))
+ return ret;
ret = nexthdr[1];
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: ipv6: fix return value check in esp_remove_trailer
2023-10-07 0:59 [PATCH] net: ipv6: fix return value check in esp_remove_trailer Ma Ke
@ 2023-10-08 17:07 ` Cong Wang
2023-10-10 9:03 ` Herbert Xu
2023-10-13 5:55 ` Steffen Klassert
1 sibling, 1 reply; 5+ messages in thread
From: Cong Wang @ 2023-10-08 17:07 UTC (permalink / raw)
To: Ma Ke
Cc: steffen.klassert, herbert, davem, dsahern, edumazet, kuba, pabeni,
netdev, linux-kernel
On Sat, Oct 07, 2023 at 08:59:53AM +0800, Ma Ke wrote:
> In esp_remove_trailer(), to avoid an unexpected result returned by
> pskb_trim, we should check the return value of pskb_trim().
>
> Signed-off-by: Ma Ke <make_ruc2021@163.com>
> ---
> net/ipv6/esp6.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
We need the same change for net/ipv4/esp4.c?
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: ipv6: fix return value check in esp_remove_trailer
2023-10-08 17:07 ` Cong Wang
@ 2023-10-10 9:03 ` Herbert Xu
2023-10-13 5:53 ` Steffen Klassert
0 siblings, 1 reply; 5+ messages in thread
From: Herbert Xu @ 2023-10-10 9:03 UTC (permalink / raw)
To: Cong Wang
Cc: Ma Ke, steffen.klassert, davem, dsahern, edumazet, kuba, pabeni,
netdev, linux-kernel
On Sun, Oct 08, 2023 at 10:07:30AM -0700, Cong Wang wrote:
> On Sat, Oct 07, 2023 at 08:59:53AM +0800, Ma Ke wrote:
> > In esp_remove_trailer(), to avoid an unexpected result returned by
> > pskb_trim, we should check the return value of pskb_trim().
> >
> > Signed-off-by: Ma Ke <make_ruc2021@163.com>
> > ---
> > net/ipv6/esp6.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
>
> We need the same change for net/ipv4/esp4.c?
Please verify that it can actually fail first. Note that I'm
busy right now so I haven't looked at it at all.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: ipv6: fix return value check in esp_remove_trailer
2023-10-10 9:03 ` Herbert Xu
@ 2023-10-13 5:53 ` Steffen Klassert
0 siblings, 0 replies; 5+ messages in thread
From: Steffen Klassert @ 2023-10-13 5:53 UTC (permalink / raw)
To: Herbert Xu
Cc: Cong Wang, Ma Ke, davem, dsahern, edumazet, kuba, pabeni, netdev,
linux-kernel
On Tue, Oct 10, 2023 at 05:03:48PM +0800, Herbert Xu wrote:
> On Sun, Oct 08, 2023 at 10:07:30AM -0700, Cong Wang wrote:
> > On Sat, Oct 07, 2023 at 08:59:53AM +0800, Ma Ke wrote:
> > > In esp_remove_trailer(), to avoid an unexpected result returned by
> > > pskb_trim, we should check the return value of pskb_trim().
> > >
> > > Signed-off-by: Ma Ke <make_ruc2021@163.com>
> > > ---
> > > net/ipv6/esp6.c | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > We need the same change for net/ipv4/esp4.c?
>
> Please verify that it can actually fail first. Note that I'm
> busy right now so I haven't looked at it at all.
It can, we don't linearize the packte data anymore.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: ipv6: fix return value check in esp_remove_trailer
2023-10-07 0:59 [PATCH] net: ipv6: fix return value check in esp_remove_trailer Ma Ke
2023-10-08 17:07 ` Cong Wang
@ 2023-10-13 5:55 ` Steffen Klassert
1 sibling, 0 replies; 5+ messages in thread
From: Steffen Klassert @ 2023-10-13 5:55 UTC (permalink / raw)
To: Ma Ke; +Cc: herbert, davem, dsahern, edumazet, kuba, pabeni, netdev,
linux-kernel
On Sat, Oct 07, 2023 at 08:59:53AM +0800, Ma Ke wrote:
> In esp_remove_trailer(), to avoid an unexpected result returned by
> pskb_trim, we should check the return value of pskb_trim().
>
> Signed-off-by: Ma Ke <make_ruc2021@163.com>
Applied, thanks a lot!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-13 5:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-07 0:59 [PATCH] net: ipv6: fix return value check in esp_remove_trailer Ma Ke
2023-10-08 17:07 ` Cong Wang
2023-10-10 9:03 ` Herbert Xu
2023-10-13 5:53 ` Steffen Klassert
2023-10-13 5:55 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).