Commit b0471c26 authored by Haiyue Wang's avatar Haiyue Wang Committed by Jakub Kicinski

gve: enhance no queue page list detection

The commit
a5886ef4 ("gve: Introduce per netdev `enum gve_queue_format`")
introduces three queue format type, only GVE_GQI_QPL_FORMAT queue has
page list. So it should use the queue page list number to detect the
zero size queue page list. Correct the design logic.

Using the 'queue_format == GVE_GQI_RDA_FORMAT' may lead to request zero
sized memory allocation, like if the queue format is GVE_DQO_RDA_FORMAT.

The kernel memory subsystem will return ZERO_SIZE_PTR, which is not NULL
address, so the driver can run successfully. Also the code still checks
the queue page list number firstly, then accesses the allocated memory,
so zero number queue page list allocation will not lead to access fault.
Signed-off-by: default avatarHaiyue Wang <haiyue.wang@intel.com>
Reviewed-by: default avatarBailey Forrest <bcf@google.com>
Link: https://lore.kernel.org/r/20220215051751.260866-1-haiyue.wang@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2c955856
...@@ -857,8 +857,7 @@ static int gve_alloc_qpls(struct gve_priv *priv) ...@@ -857,8 +857,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
int i, j; int i, j;
int err; int err;
/* Raw addressing means no QPLs */ if (num_qpls == 0)
if (priv->queue_format == GVE_GQI_RDA_FORMAT)
return 0; return 0;
priv->qpls = kvcalloc(num_qpls, sizeof(*priv->qpls), GFP_KERNEL); priv->qpls = kvcalloc(num_qpls, sizeof(*priv->qpls), GFP_KERNEL);
...@@ -901,8 +900,7 @@ static void gve_free_qpls(struct gve_priv *priv) ...@@ -901,8 +900,7 @@ static void gve_free_qpls(struct gve_priv *priv)
int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv); int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv);
int i; int i;
/* Raw addressing means no QPLs */ if (num_qpls == 0)
if (priv->queue_format == GVE_GQI_RDA_FORMAT)
return; return;
kvfree(priv->qpl_cfg.qpl_id_map); kvfree(priv->qpl_cfg.qpl_id_map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment