From: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
To: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
nbd-Vt+b4OUoWG0@public.gmane.org
Subject: [PATCH 02/12] net-next: mediatek: add missing return code check
Date: Thu, 5 May 2016 11:26:15 +0200 [thread overview]
Message-ID: <1462440385-51939-3-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1462440385-51939-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
The code fails to check if the scratch memory was properly allocated. Add
this check and return with an error if the allocation failed.
Signed-off-by: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 07674e5..0ed49a4 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -483,6 +483,9 @@ static int mtk_init_fq_dma(struct mtk_eth *eth)
eth->scratch_head = kcalloc(cnt, MTK_QDMA_PAGE_SIZE,
GFP_KERNEL);
+ if (unlikely(!eth->scratch_head))
+ return -ENOMEM;
+
dma_addr = dma_map_single(eth->dev,
eth->scratch_head, cnt * MTK_QDMA_PAGE_SIZE,
DMA_FROM_DEVICE);
--
1.7.10.4
next prev parent reply other threads:[~2016-05-05 9:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 9:26 [PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes John Crispin
2016-05-05 9:26 ` [PATCH 01/12] net-next: mediatek: fix DQL support John Crispin
[not found] ` <1462440385-51939-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
2016-05-05 9:26 ` John Crispin [this message]
2016-05-05 9:26 ` [PATCH 03/12] net-next: mediatek: fix missing free of scratch memory John Crispin
2016-05-05 9:26 ` [PATCH 04/12] net-next: mediatek: invalid buffer lookup in mtk_tx_map() John Crispin
2016-05-05 9:26 ` [PATCH 05/12] net-next: mediatek: dropped rx packets are not being counted properly John Crispin
2016-05-05 9:26 ` [PATCH 06/12] net-next: mediatek: add next data pointer coherency protection John Crispin
2016-05-05 9:26 ` [PATCH 07/12] net-next: mediatek: disable all interrupts during probe John Crispin
2016-05-05 9:26 ` [PATCH 08/12] net-next: mediatek: fix threshold value John Crispin
2016-05-05 9:26 ` [PATCH 09/12] net-next: mediatek: increase watchdog_timeo John Crispin
2016-05-05 9:26 ` [PATCH 10/12] net-next: mediatek: fix off by one in the TX ring allocation John Crispin
2016-05-05 9:26 ` [PATCH 11/12] net-next: mediatek: only wake the queue if it is stopped John Crispin
2016-05-05 9:26 ` [PATCH 12/12] net-next: mediatek: remove superfluous queue wake up call John Crispin
2016-05-05 12:25 ` [PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes Andrew Lunn
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=1462440385-51939-3-git-send-email-john@phrozen.org \
--to=john-pj+rj9u5fofafugrpc6u6w@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=nbd-Vt+b4OUoWG0@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/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).