Commit e4cab45a authored by Louis Peens's avatar Louis Peens Committed by David S. Miller

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: default avatarLouis Peens <louis.peens@netronome.com>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e76a2ff
...@@ -30,6 +30,8 @@ struct nfp_app; ...@@ -30,6 +30,8 @@ struct nfp_app;
#define NFP_FLOWER_MASK_ELEMENT_RS 1 #define NFP_FLOWER_MASK_ELEMENT_RS 1
#define NFP_FLOWER_MASK_HASH_BITS 10 #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_META_FLAG_MANAGE_MASK BIT(7)
#define NFP_FL_MASK_REUSE_TIME_NS 40000 #define NFP_FL_MASK_REUSE_TIME_NS 40000
......
...@@ -434,6 +434,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app, ...@@ -434,6 +434,7 @@ int nfp_flower_compile_flow_match(struct nfp_app *app,
{ {
struct flow_rule *rule = flow_cls_offload_flow_rule(flow); struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
u32 port_id; u32 port_id;
int ext_len;
int err; int err;
u8 *ext; u8 *ext;
u8 *msk; u8 *msk;
...@@ -589,5 +590,15 @@ int nfp_flower_compile_flow_match(struct nfp_app *app, ...@@ -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; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment