i40evf: don't overflow buffer

Orabug: 24568124

If the user adds an obscene amount of MAC addresses, the driver will run
into the situation where it has too many address requests to fit into a
single PF message. The driver checks for this case, and calculates the
maximum number of messages that it can send. Then it completely ignores
this count and overflows the buffer.

Fix this by checking the address count and bailing out of the loop at
the appropriate time.

Change-ID: If8dcbb04602c75941dc0cd8309065e1de9ca791c
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 0e8d95f8965dc2e6f22e5b321b73de7b0396dc4a)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index f13445691507c2b7ea668f402cbb04e6f65cf38c..d76c221d4c8a3ab7f2e5fe386962842b91d8ae2c 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -434,6 +434,8 @@ void i40evf_add_ether_addrs(struct i40evf_adapter *adapter)
                        ether_addr_copy(veal->list[i].addr, f->macaddr);
                        i++;
                        f->add = false;
+                       if (i == count)
+                               break;
                }
        }
        if (!more)
@@ -497,6 +499,8 @@ void i40evf_del_ether_addrs(struct i40evf_adapter *adapter)
                        i++;
                        list_del(&f->list);
                        kfree(f);
+                       if (i == count)
+                               break;
                }
        }
        if (!more)
@@ -560,6 +564,8 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter)
                        vvfl->vlan_id[i] = f->vlan;
                        i++;
                        f->add = false;
+                       if (i == count)
+                               break;
                }
        }
        if (!more)
@@ -623,6 +629,8 @@ void i40evf_del_vlans(struct i40evf_adapter *adapter)
                        i++;
                        list_del(&f->list);
                        kfree(f);
+                       if (i == count)
+                               break;
                }
        }
        if (!more)