Patch "Revert "flow_offload: action should not be NULL when it is referenced"" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    Revert "flow_offload: action should not be NULL when it is referenced"

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-flow_offload-action-should-not-be-null-when-i.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 88617e79c6c9525b58779924c43bd2cf2f854f08
Author: Ido Schimmel <idosch@xxxxxxxxxx>
Date:   Thu Aug 19 13:58:42 2021 +0300

    Revert "flow_offload: action should not be NULL when it is referenced"
    
    [ Upstream commit fa05bdb89b01b098aad19ec0ebc4d1cc7b11177e ]
    
    This reverts commit 9ea3e52c5bc8bb4a084938dc1e3160643438927a.
    
    Cited commit added a check to make sure 'action' is not NULL, but
    'action' is already dereferenced before the check, when calling
    flow_offload_has_one_action().
    
    Therefore, the check does not make any sense and results in a smatch
    warning:
    
    include/net/flow_offload.h:322 flow_action_mixed_hw_stats_check() warn:
    variable dereferenced before check 'action' (see line 319)
    
    Fix by reverting this commit.
    
    Cc: gushengxian <gushengxian@xxxxxxxxxx>
    Fixes: 9ea3e52c5bc8 ("flow_offload: action should not be NULL when it is referenced")
    Signed-off-by: Ido Schimmel <idosch@xxxxxxxxxx>
    Acked-by: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20210819105842.1315705-1-idosch@xxxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 161b90979038..123b1e9ea304 100644
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -312,14 +312,12 @@ flow_action_mixed_hw_stats_check(const struct flow_action *action,
 	if (flow_offload_has_one_action(action))
 		return true;
 
-	if (action) {
-		flow_action_for_each(i, action_entry, action) {
-			if (i && action_entry->hw_stats != last_hw_stats) {
-				NL_SET_ERR_MSG_MOD(extack, "Mixing HW stats types for actions is not supported");
-				return false;
-			}
-			last_hw_stats = action_entry->hw_stats;
+	flow_action_for_each(i, action_entry, action) {
+		if (i && action_entry->hw_stats != last_hw_stats) {
+			NL_SET_ERR_MSG_MOD(extack, "Mixing HW stats types for actions is not supported");
+			return false;
 		}
+		last_hw_stats = action_entry->hw_stats;
 	}
 	return true;
 }