summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAleksander Jan Bajkowski <olek2@wp.pl>2022-08-24 23:54:06 +0200
committerJakub Kicinski <kuba@kernel.org>2022-08-25 21:41:38 +0200
commitc8b043702dc0894c07721c5b019096cebc8c798f (patch)
tree8c74a7e4a530a6e81e78362a455922335c4f30f1 /drivers/net/ethernet
parentnet: stmmac: work around sporadic tx issue on link-up (diff)
downloadlinux-c8b043702dc0894c07721c5b019096cebc8c798f.tar.xz
linux-c8b043702dc0894c07721c5b019096cebc8c798f.zip
net: lantiq_xrx200: confirm skb is allocated before using
xrx200_hw_receive() assumes build_skb() always works and goes straight to skb_reserve(). However, build_skb() can fail under memory pressure. Add a check in case build_skb() failed to allocate and return NULL. Fixes: e015593573b3 ("net: lantiq_xrx200: convert to build_skb") Reported-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/lantiq_xrx200.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c
index 5edb68a8aab1..89314b645c82 100644
--- a/drivers/net/ethernet/lantiq_xrx200.c
+++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -239,6 +239,12 @@ static int xrx200_hw_receive(struct xrx200_chan *ch)
}
skb = build_skb(buf, priv->rx_skb_size);
+ if (!skb) {
+ skb_free_frag(buf);
+ net_dev->stats.rx_dropped++;
+ return -ENOMEM;
+ }
+
skb_reserve(skb, NET_SKB_PAD);
skb_put(skb, len);