Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b95a2d83 authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by David S. Miller
Browse files

nfp: add whitelist of supported flow dissector 



Previously we did not check the flow dissector against a list of allowed
and supported flow key dissectors. This patch introduces such a list and
correctly rejects unsupported flow keys.

Fixes: 43f84b72 ("nfp: add metadata to each flow offload")
Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 255cd50f

drivers/net/ethernet/netronome/nfp/flower/offload.c

+13 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ 
#include "../nfp_net.h"

#include "../nfp_port.h"



#define NFP_FLOWER_WHITELIST_DISSECTOR \

	(BIT(FLOW_DISSECTOR_KEY_CONTROL) | \

	 BIT(FLOW_DISSECTOR_KEY_BASIC) | \

	 BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) | \

	 BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) | \

	 BIT(FLOW_DISSECTOR_KEY_PORTS) | \

	 BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) | \

	 BIT(FLOW_DISSECTOR_KEY_VLAN) | \

	 BIT(FLOW_DISSECTOR_KEY_IP))



static int

nfp_flower_xmit_flow(struct net_device *netdev,

		     struct nfp_fl_payload *nfp_flow, u8 mtype)
@@ -112,6 +122,9 @@ nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls, 
	u8 key_layer;

	int key_size;



	if (flow->dissector->used_keys & ~NFP_FLOWER_WHITELIST_DISSECTOR)

		return -EOPNOTSUPP;



	if (dissector_uses_key(flow->dissector,

			       FLOW_DISSECTOR_KEY_ENC_CONTROL)) {

		struct flow_dissector_key_control *mask_enc_ctl =