From ad9ed9e519aef0990b58ce078e497ce2ea764695 Mon Sep 17 00:00:00 2001 From: Alfredo Cardigliano Date: Fri, 26 Jul 2024 09:56:04 +0200 Subject: [PATCH] Rework ptr access to avoid false array-index-out-of-bounds errors --- drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_main.c | 2 +- drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_virtchnl.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_main.c b/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_main.c index 01246301c..62431a5ec 100644 --- a/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_main.c +++ b/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_main.c @@ -4512,7 +4512,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter, BIT(FLOW_DISSECTOR_KEY_ENC_KEYID) | #endif /* HAVE_TC_FLOWER_ENC */ BIT(FLOW_DISSECTOR_KEY_PORTS))) { - dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%llx\n", + dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%x\n", dissector->used_keys); return -EOPNOTSUPP; } diff --git a/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_virtchnl.c b/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_virtchnl.c index 5d9498c66..14b12adbc 100644 --- a/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_virtchnl.c +++ b/drivers/intel/iavf/iavf-4.9.5-zc/src/iavf_virtchnl.c @@ -995,15 +995,17 @@ void iavf_add_ether_addrs(struct iavf_adapter *adapter) veal->num_elements = count; i = 0; list_for_each_entry(f, &adapter->mac_filter_list, list) { + struct virtchnl_ether_addr *ether_addr_array = &veal->list[0]; + if (i == count) break; if (is_primary && !(f->is_primary && f->add)) continue; if (!f->add) continue; - ether_addr_copy(veal->list[i].addr, + ether_addr_copy(ether_addr_array[i].addr, f->macaddr); - iavf_set_mac_addr_type(&veal->list[i], f); + iavf_set_mac_addr_type(ðer_addr_array[i], f); f->add = false; i++; }