| Message ID | 20230717144652.23408-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bce5603365d8184734ba7e6b22e74bd2c90a7167 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] drivers:net: fix return value check in ocelot_fdma_receive_skb | expand |
From: Yuanjun Gong <ruc_gongyuanjun@163.com> Date: Mon, 17 Jul 2023 22:46:52 +0800 > ocelot_fdma_receive_skb should return false if an unexpected > value is returned by pskb_trim. > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> Fixes: 753a026cfec1 ("net: ocelot: add FDMA support") Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> > --- > drivers/net/ethernet/mscc/ocelot_fdma.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mscc/ocelot_fdma.c b/drivers/net/ethernet/mscc/ocelot_fdma.c > index 8e3894cf5f7c..83a3ce0c568e 100644 > --- a/drivers/net/ethernet/mscc/ocelot_fdma.c > +++ b/drivers/net/ethernet/mscc/ocelot_fdma.c > @@ -368,7 +368,8 @@ static bool ocelot_fdma_receive_skb(struct ocelot *ocelot, struct sk_buff *skb) > if (unlikely(!ndev)) > return false; > > - pskb_trim(skb, skb->len - ETH_FCS_LEN); > + if (pskb_trim(skb, skb->len - ETH_FCS_LEN)) > + return false; > > skb->dev = ndev; > skb->protocol = eth_type_trans(skb, skb->dev); > -- > 2.17.1
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 17 Jul 2023 22:46:52 +0800 you wrote: > ocelot_fdma_receive_skb should return false if an unexpected > value is returned by pskb_trim. > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > drivers/net/ethernet/mscc/ocelot_fdma.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Here is the summary with links: - [1/1] drivers:net: fix return value check in ocelot_fdma_receive_skb https://git.kernel.org/netdev/net/c/bce5603365d8 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mscc/ocelot_fdma.c b/drivers/net/ethernet/mscc/ocelot_fdma.c index 8e3894cf5f7c..83a3ce0c568e 100644 --- a/drivers/net/ethernet/mscc/ocelot_fdma.c +++ b/drivers/net/ethernet/mscc/ocelot_fdma.c @@ -368,7 +368,8 @@ static bool ocelot_fdma_receive_skb(struct ocelot *ocelot, struct sk_buff *skb) if (unlikely(!ndev)) return false; - pskb_trim(skb, skb->len - ETH_FCS_LEN); + if (pskb_trim(skb, skb->len - ETH_FCS_LEN)) + return false; skb->dev = ndev; skb->protocol = eth_type_trans(skb, skb->dev);
ocelot_fdma_receive_skb should return false if an unexpected value is returned by pskb_trim. Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> --- drivers/net/ethernet/mscc/ocelot_fdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)