From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 9/9] i40e: Check for memory allocation failure
Date: Wed, 31 May 2017 03:48:56 -0700 [thread overview]
Message-ID: <20170531104856.47929-10-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20170531104856.47929-1-jeffrey.t.kirsher@intel.com>
From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
If 'kzalloc' fails, a NULL pointer will be dereferenced. Return -ENOMEM
instead.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_client.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c
index c3b81a97558e..088b4a43bd2a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_client.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -595,6 +595,8 @@ static int i40e_client_setup_qvlist(struct i40e_info *ldev,
size = sizeof(struct i40e_qvlist_info) +
(sizeof(struct i40e_qv_info) * (qvlist_info->num_vectors - 1));
ldev->qvlist_info = kzalloc(size, GFP_KERNEL);
+ if (!ldev->qvlist_info)
+ return -ENOMEM;
ldev->qvlist_info->num_vectors = qvlist_info->num_vectors;
for (i = 0; i < qvlist_info->num_vectors; i++) {
--
2.12.2
next prev parent reply other threads:[~2017-05-31 10:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 10:48 [net-next 0/9][pull request] 40GbE Intel Wired LAN Driver Updates 2017-05-31 Jeff Kirsher
2017-05-31 10:48 ` [net-next 1/9] i40evf: fix duplicate lines Jeff Kirsher
2017-05-31 10:48 ` [net-next 2/9] i40evf: fix merge error in older patch Jeff Kirsher
2017-05-31 10:48 ` [net-next 3/9] i40evf: disable unused flags Jeff Kirsher
2017-05-31 10:48 ` [net-next 4/9] i40e: fix race condition with PTP_TX_IN_PROGRESS bits Jeff Kirsher
2017-05-31 10:48 ` [net-next 5/9] i40e: avoid permanent lock of *_PTP_TX_IN_PROGRESS Jeff Kirsher
2017-05-31 10:48 ` [net-next 6/9] i40e: add statistic indicating number of skipped Tx timestamps Jeff Kirsher
2017-05-31 10:48 ` [net-next 7/9] i40e: use pf data structure directly in i40e_ptp_rx_hang Jeff Kirsher
2017-05-31 10:48 ` [net-next 8/9] i40e: check for Tx timestamp timeouts during watchdog Jeff Kirsher
2017-05-31 10:48 ` Jeff Kirsher [this message]
2017-05-31 21:51 ` [net-next 0/9][pull request] 40GbE Intel Wired LAN Driver Updates 2017-05-31 David Miller
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=20170531104856.47929-10-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@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