diff options
| author | Louis Peens <louis.peens@netronome.com> | 2020-08-20 16:39:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-20 16:04:42 -0700 |
| commit | e4cab45a19cde8c03e9af3124ef1513ed58ca3a6 (patch) | |
| tree | 85077b8f3f1aeb86f4ad54a7bc509ff54c186149 /drivers/net | |
| parent | 1e76a2ff317d0dd9db60b5d9bb6e8215c1513fa8 (diff) | |
nfp: flower: check that we don't exceed the FW key size
Add a check to make sure the total length of the flow key sent to the
firmware stays within the supported limit.
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/main.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/match.c | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h index 3bf9c1afa45e..4924a217f5ba 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/main.h +++ b/drivers/net/ethernet/netronome/nfp/flower/main.h @@ -30,6 +30,8 @@ struct nfp_app; #define NFP_FLOWER_MASK_ELEMENT_RS 1 #define NFP_FLOWER_MASK_HASH_BITS 10 +#define NFP_FLOWER_KEY_MAX_LW 32 + #define NFP_FL_META_FLAG_MANAGE_MASK BIT(7) #define NFP_FL_MASK_REUSE_TIME_NS 40000 diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c index f7f01e2e3dce..64690511e47b 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/match.c +++ b/drivers/net/ethernet/netronome/nfp/flower/match.c @@ -434,6 +434,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app, { struct flow_rule *rule = flow_cls_offload_flow_rule(flow); u32 port_id; + int ext_len; int err; u8 *ext; u8 *msk; @@ -589,5 +590,15 @@ int nfp_flower_compile_flow_match(struct nfp_app *app, } } + /* Check that the flow key does not exceed the maximum limit. + * All structures in the key is multiples of 4 bytes, so use u32. + */ + ext_len = (u32 *)ext - (u32 *)nfp_flow->unmasked_data; + if (ext_len > NFP_FLOWER_KEY_MAX_LW) { + NL_SET_ERR_MSG_MOD(extack, + "unsupported offload: flow key too long"); + return -EOPNOTSUPP; + } + return 0; } |