Merge tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / net / openvswitch / flow.c

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index e2c348b..50ec42f 100644 (file)
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -717,6 +717,8 @@ int ovs_flow_key_extract_userspace(const struct nlattr *attr,
 {
        int err;
 
+       memset(key, 0, OVS_SW_FLOW_KEY_METADATA_SIZE);
+
        /* Extract metadata from netlink attributes. */
        err = ovs_nla_get_flow_metadata(attr, key, log);
        if (err)