| Message ID | 20210714073501.133736-1-haiyue.wang@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 63a9192b8fa1ea55efeba1f18fad52bb24d9bf12 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1] gve: fix the wrong AdminQ buffer overflow check | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 10 of 10 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 18 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Jul 14, 2021 at 12:58 AM Haiyue Wang <haiyue.wang@intel.com> 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 <haiyue.wang@intel.com> Reviewed-by: Catherine Sullivan <csully@google.com> > --- > drivers/net/ethernet/google/gve/gve_adminq.c | 6 ++++-- > 1 file 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; > -- > 2.32.0 > Thanks!
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): 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 <haiyue.wang@intel.com> > --- > 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
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;
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> --- drivers/net/ethernet/google/gve/gve_adminq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)