1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index df43e7c6777c..01874c0fff1d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -75,13 +75,15 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
  * @mask: debug mask
  * @desc: pointer to admin queue descriptor
  * @buffer: pointer to command buffer
+ * @buf_len: max length of buffer
  *
  * Dumps debug log about adminq command with descriptor contents.
  **/
 void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
-                   void *buffer)
+                   void *buffer, u16 buf_len)
 {
         struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;
+        u16 len = le16_to_cpu(aq_desc->datalen);
         u8 *aq_buffer = (u8 *)buffer;
         u32 data[4];
         u32 i = 0;
@@ -105,7 +107,9 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
         if ((buffer != NULL) && (aq_desc->datalen != 0)) {
                 memset(data, 0, sizeof(data));
                 i40e_debug(hw, mask, "AQ CMD Buffer:\n");
-                for (i = 0; i < le16_to_cpu(aq_desc->datalen); i++) {
+                if (buf_len < len)
+                        len = buf_len;
+                for (i = 0; i < len; i++) {
                         data[((i % 16) / 4)] |=
                                 ((u32)aq_buffer[i]) << (8 * (i % 4));
                         if ((i % 16) == 15) {