From: Aleksander Jan Bajkowski <olek2@wp.pl>
To: hauke@hauke-m.de, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, olek2@wp.pl,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net v3 1/3] net: lantiq_xrx200: confirm skb is allocated before using
Date: Wed, 24 Aug 2022 23:54:06 +0200 [thread overview]
Message-ID: <20220824215408.4695-2-olek2@wp.pl> (raw)
In-Reply-To: <20220824215408.4695-1-olek2@wp.pl>
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>
---
drivers/net/ethernet/lantiq_xrx200.c | 6 ++++++
1 file changed, 6 insertions(+)
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);
--
2.30.2
next prev parent reply other threads:[~2022-08-24 21:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-24 21:54 [PATCH net v3 0/3] net: lantiq_xrx200: fix errors under memory pressure Aleksander Jan Bajkowski
2022-08-24 21:54 ` Aleksander Jan Bajkowski [this message]
2022-08-24 21:54 ` [PATCH net v3 2/3] net: lantiq_xrx200: fix lock " Aleksander Jan Bajkowski
2022-08-24 21:54 ` [PATCH net v3 3/3] net: lantiq_xrx200: restore buffer if memory allocation failed Aleksander Jan Bajkowski
2022-08-25 20:00 ` [PATCH net v3 0/3] net: lantiq_xrx200: fix errors under memory pressure patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220824215408.4695-2-olek2@wp.pl \
--to=olek2@wp.pl \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hauke@hauke-m.de \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).