diff options
author | Haiyue Wang <haiyue.wang@intel.com> | 2021-07-14 15:34:59 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-07-16 10:41:40 -0700 |
commit | 63a9192b8fa1ea55efeba1f18fad52bb24d9bf12 (patch) | |
tree | 0849a5715854aab35372c862d35b002631bb4b38 | |
parent | 82a1ffe57ec6455658584459de56ee4b401c1dfb (diff) | |
download | linux-stable-63a9192b8fa1ea55efeba1f18fad52bb24d9bf12.tar.gz linux-stable-63a9192b8fa1ea55efeba1f18fad52bb24d9bf12.tar.bz2 linux-stable-63a9192b8fa1ea55efeba1f18fad52bb24d9bf12.zip |
gve: fix the wrong AdminQ buffer overflow check
The 'tail' pointer is also free-running count, so it needs to be masked
as 'adminq_prod_cnt' does, to become an index value of AdminQ buffer.
Fixes: 5cdad90de62c ("gve: Batch AQ commands for creating and destroying queues.")
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Reviewed-by: Catherine Sullivan <csully@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/google/gve/gve_adminq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c index 5bb56b454541..f089d33dd48e 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -322,7 +322,8 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv, tail = ioread32be(&priv->reg_bar0->adminq_event_counter); // Check if next command will overflow the buffer. - if (((priv->adminq_prod_cnt + 1) & priv->adminq_mask) == tail) { + if (((priv->adminq_prod_cnt + 1) & priv->adminq_mask) == + (tail & priv->adminq_mask)) { int err; // Flush existing commands to make room. @@ -332,7 +333,8 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv, // Retry. tail = ioread32be(&priv->reg_bar0->adminq_event_counter); - if (((priv->adminq_prod_cnt + 1) & priv->adminq_mask) == tail) { + if (((priv->adminq_prod_cnt + 1) & priv->adminq_mask) == + (tail & priv->adminq_mask)) { // This should never happen. We just flushed the // command queue so there should be enough space. return -ENOMEM; |