[ovs-git] [openvswitch/ovs] 4ba224: dp-packet: Add 'dp_packet_l3_size()'.

[Aaron Conole]

  Branch: refs/heads/branch-2.9
  Home:   https://github.com/openvswitch/ovs
  Commit: 4ba2240f2ba9325f1e4a7d2f0ad08637d6a77d59
      https://github.com/openvswitch/ovs/commit/4ba2240f2ba9325f1e4a7d2f0ad08637d6a77d59
  Author: Darrell Ball <dlu998 at gmail.com>
  Date:   2019-02-13 (Wed, 13 Feb 2019)

  Changed paths:
    M lib/dp-packet.h

  Log Message:
  -----------
  dp-packet: Add 'dp_packet_l3_size()'.

The new api will be used in a subsequent patch.

Signed-off-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: e0828e8f49109df1b5b1c5c28bf7ef0e49e7f5a6
      https://github.com/openvswitch/ovs/commit/e0828e8f49109df1b5b1c5c28bf7ef0e49e7f5a6
  Author: Darrell Ball <dlu998 at gmail.com>
  Date:   2019-02-13 (Wed, 13 Feb 2019)

  Changed paths:
    M lib/conntrack.c

  Log Message:
  -----------
  conntrack: Exclude l2 padding in 'conn_key_extract()'.

'conn_key_extract()' in userspace conntrack is including L2
(Ethernet) pad bytes for both L3 and L4 sizes. One problem is
any packet with non-zero L2 padding can incorrectly fail L4
checksum validation.

This patch fixes conn_key_extract() by ignoring L2 pad bytes.

Fixes: a489b16854b5 ("conntrack: New userspace connection tracker.")
CC: Daniele Di Proietto <diproiettod at ovn.org>
Co-authored-by: Vishal Deep Ajmera <vishal.deep.ajmera at ericsson.com>
Co-authored-by: Venkatesan Pradeep <venkatesan.pradeep at ericsson.com>
Co-authored-by: Nitin Katiyar <nitin.katiyar at ericsson.com>
Signed-off-by: Vishal Deep Ajmera <vishal.deep.ajmera at ericsson.com>
Signed-off-by: Venkatesan Pradeep <venkatesan.pradeep at ericsson.com>
Signed-off-by: Nitin Katiyar <nitin.katiyar at ericsson.com>
Signed-off-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 712dfe31bb0623b95ddd5b97932fcf34d47e1e92
      https://github.com/openvswitch/ovs/commit/712dfe31bb0623b95ddd5b97932fcf34d47e1e92
  Author: Aaron Conole <aconole at redhat.com>
  Date:   2019-02-13 (Wed, 13 Feb 2019)

  Changed paths:
    M lib/lldp/lldpd.c

  Log Message:
  -----------
  lldp: fix string warnings

lib/lldp/lldpd.c: In function :
lib/lldp/lldpd.c:520:17: warning:  output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
                strncat(buffer, cfg->g_protocols[i].name,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                strlen(cfg->g_protocols[i].name));
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

lib/lldp/lldpd.c: In function :
lib/lldp/lldpd.c:519:17: warning:  specified bound 2 equals source length [-Wstringop-overflow=]
                strncat(buffer, ", ", 2);
                ^~~~~~~~~~~~~~~~~~~~~~~~

Closer inspection shows that buffer is only used to output protocol names
when debug logging is enabled, so restructure the code a bit as well.

Signed-off-by: Aaron Conole <aconole at redhat.com>
Reviewed-by: Yifeng Sun <pkusunyifeng at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/c88a9bdc4493...712dfe31bb06