Commit fa05bdb8 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

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



This reverts commit 9ea3e52c.

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@yulong.com>
Fixes: 9ea3e52c ("flow_offload: action should not be NULL when it is referenced")
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20210819105842.1315705-1-idosch@idosch.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d584566c

include/net/flow_offload.h

+5 −7
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ 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");
@@ -327,7 +326,6 @@ flow_action_mixed_hw_stats_check(const struct flow_action *action, 
		}

		last_hw_stats = action_entry->hw_stats;

	}

	}

	return true;

}