gve: fix the wrong AdminQ buffer overflow check
Subsystems (3)
PATCH 1/1 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.
--- drivers/net/ethernet/google/gve/gve_adminq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/google/gve/gve_adminq.c +4 -2
@@ -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 ;
Signature · 1 line
2.32.0
Quoted 6 lines · Haiyue Wang
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 <[email protected]>
Quoted 29 lines
--- drivers/net/ethernet/google/gve/gve_adminq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/ethernet/google/gve/gve_adminq.c +4
-3@@ -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 ; --
Quoted 2 lines
2.32.0
Thanks!
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 14 Jul 2021 15:34:59 +0800 you wrote:
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 <[email protected]>--- drivers/net/ethernet/google/gve/gve_adminq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Here is the summary with links:
- [v1] gve: fix the wrong AdminQ buffer overflow check
https://git.kernel.org/netdev/net-next/c/63a9192b8fa1
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html