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: 43f84b72c50d ("nfp: add metadata to each flow offload")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index d396183..a18b4d2 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -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 =