From 179c044d32bf9d11bd68369f4701173b90dcd557 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Dec 2023 22:27:10 +0900 Subject: [PATCH] 6.1-stable patches added patches: octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch --- ...al-to-fix-uninitialized-symbol-error.patch | 42 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-6.1/octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch diff --git a/queue-6.1/octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch b/queue-6.1/octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch new file mode 100644 index 00000000000..e735c0458b1 --- /dev/null +++ b/queue-6.1/octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch @@ -0,0 +1,42 @@ +From 222a6c42e9ef131fd20463bf95d7ce7b39bee2f8 Mon Sep 17 00:00:00 2001 +From: Suman Ghosh +Date: Thu, 27 Jul 2023 22:01:01 +0530 +Subject: octeontx2-af: Initialize 'cntr_val' to fix uninitialized symbol error + +From: Suman Ghosh + +commit 222a6c42e9ef131fd20463bf95d7ce7b39bee2f8 upstream. + +drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c:860 +otx2_tc_update_mcam_table_del_req() +error: uninitialized symbol 'cntr_val'. + +Fixes: ec87f05402f5 ("octeontx2-af: Install TC filter rules in hardware based on priority") +Signed-off-by: Suman Ghosh +Link: https://lore.kernel.org/r/20230727163101.2793453-1-sumang@marvell.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c ++++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +@@ -842,7 +842,7 @@ static int otx2_tc_update_mcam_table_del + struct list_head *pos, *n; + struct otx2_tc_flow *tmp; + int i = 0, index = 0; +- u16 cntr_val; ++ u16 cntr_val = 0; + + /* Find and delete the entry from the list and re-install + * all the entries from beginning to the index of the +@@ -881,7 +881,7 @@ static int otx2_tc_update_mcam_table_add + int mcam_idx = flow_cfg->max_flows - flow_cfg->nr_flows - 1; + struct otx2_tc_flow *tmp; + int list_idx, i; +- u16 cntr_val; ++ u16 cntr_val = 0; + + /* Find the index of the entry(list_idx) whose priority + * is greater than the new entry and re-install all diff --git a/queue-6.1/series b/queue-6.1/series index 7b6765e093a..a18d0dd0a36 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -77,6 +77,7 @@ net-ravb-stop-dma-in-case-of-failures-on-ravb_open.patch net-ravb-keep-reverse-order-of-operations-in-ravb_re.patch kvm-x86-fix-lapic-timer-interrupt-lost-after-loading.patch pci-lengthen-reset-delay-for-videopropulsion-torrent.patch +octeontx2-af-initialize-cntr_val-to-fix-uninitialized-symbol-error.patch pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch spi-fix-null-dereference-on-suspend.patch -- 2.47.3