diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2019-11-26 12:55:50 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-26 15:13:46 -0800 |
| commit | 4e81c0b3fa93d07653e2415fa71656b080a112fd (patch) | |
| tree | 1ec4b3747d7bc94a73119ceb24b77d3698efe2c7 /net | |
| parent | net: phy: dp83869: Fix return paths to return proper values (diff) | |
| download | linux-dev-4e81c0b3fa93d07653e2415fa71656b080a112fd.tar.xz linux-dev-4e81c0b3fa93d07653e2415fa71656b080a112fd.zip | |
openvswitch: fix flow command message size
When user-space sets the OVS_UFID_F_OMIT_* flags, and the relevant
flow has no UFID, we can exceed the computed size, as
ovs_nla_put_identifier() will always dump an OVS_FLOW_ATTR_KEY
attribute.
Take the above in account when computing the flow command message
size.
Fixes: 74ed7ab9264c ("openvswitch: Add support for unique flow IDs.")
Reported-by: Qi Jun Ding <qding@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/datapath.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 93d4991ddc1f..293d5289c4a1 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -723,9 +723,13 @@ static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts, { size_t len = NLMSG_ALIGN(sizeof(struct ovs_header)); - /* OVS_FLOW_ATTR_UFID */ + /* OVS_FLOW_ATTR_UFID, or unmasked flow key as fallback + * see ovs_nla_put_identifier() + */ if (sfid && ovs_identifier_is_ufid(sfid)) len += nla_total_size(sfid->ufid_len); + else + len += nla_total_size(ovs_key_attr_size()); /* OVS_FLOW_ATTR_KEY */ if (!sfid || should_fill_key(sfid, ufid_flags)) |