[ovs-git] [openvswitch/ovs] 83ee26: Check flow's dl_type before setting ct_orig_tuple ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 83ee26c94149f548497914a21bb9bb5dea048857
      https://github.com/openvswitch/ovs/commit/83ee26c94149f548497914a21bb9bb5dea048857
  Author: Numan Siddique <nusiddiq at redhat.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M lib/flow.h

  Log Message:
  -----------
  Check flow's dl_type before setting ct_orig_tuple in 'pkt_metadata_from_flow()'

Normally flow's dl_type will be a valid value. However when a packet is sent to
the controller, dl_type is not stored in the 'ofputil_packet_in_private'. When
the controller resumes (OFPRAW_NXT_RESUME) the packet, the flow's dl_type will be
0. If the flow's ct_state has valid value, then the 'pkt_metadata_from_flow'
neither sets the ct_orig_tuple from the flow nor resets it. This results in invalid
value ct_orig_tuple in the pkt_metadata.

This patch handles this situation by checking the dl_type before setting the
ct_orig_tuple. If dl_type is 0, it resets it. It also resets ct_orig_tuple if
dl_type is non zero and other than IPv4 or IPv6.

Reported-by: Daniel Alvarez Sanchez <dalvarez at redhat.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-October/339868.html
Signed-off-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>