[ovs-git] [openvswitch/ovs] e24d1f: odp-util: Fix overflow of nested netlink attributes.
gvrose8192
noreply at github.com
Mon Nov 16 18:06:05 UTC 2020
Branch: refs/heads/branch-2.10
Home: https://github.com/openvswitch/ovs
Commit: e24d1f39e763615a9cd7aea9c8fc2a4a235048a7
https://github.com/openvswitch/ovs/commit/e24d1f39e763615a9cd7aea9c8fc2a4a235048a7
Author: Ilya Maximets <i.maximets at ovn.org>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/netlink.c
M lib/odp-util.c
M tests/tunnel.at
Log Message:
-----------
odp-util: Fix overflow of nested netlink attributes.
Length of nested attributes must be checked before storing to the
header. If current length exceeds the maximum value parsing should
fail, otherwise the length value will be truncated leading to
corrupted netlink message and out-of-bound memory accesses:
ERROR: AddressSanitizer: heap-buffer-overflow on address 0x6310002cc838
at pc 0x000000575470 bp 0x7ffc6c322d60 sp 0x7ffc6c322d58
READ of size 1 at 0x6310002cc838 thread T0
SCARINESS: 12 (1-byte-read-heap-buffer-overflow)
#0 0x57546f in format_generic_odp_key lib/odp-util.c:2738:39
#1 0x559e70 in check_attr_len lib/odp-util.c:3572:13
#2 0x56581a in format_odp_key_attr lib/odp-util.c:4392:9
#3 0x5563b9 in format_odp_action lib/odp-util.c:1192:9
#4 0x555d75 in format_odp_actions lib/odp-util.c:1279:13
...
Fix that by checking the length of nested netlink attributes before
updating 'nla_len' inside the header. Additionally introduced
assertion inside nl_msg_end_nested() to catch this kind of issues
before actual overflow happened.
Credit to OSS-Fuzz.
Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20003
Fixes: 65da723b40a5 ("odp-util: Format tunnel attributes directly from netlink.")
Acked-by: Flavio Leitner <fbl at sysclose.org>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: c8d4e52b70c2f77590dd155616a6d7955029de27
https://github.com/openvswitch/ovs/commit/c8d4e52b70c2f77590dd155616a6d7955029de27
Author: Renat Nurgaliyev <impleman at gmail.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M NEWS
M lib/sha1.c
M lib/sha1.h
Log Message:
-----------
sha1: Fix algorithm for data bigger than 512 megabytes.
In modern systems, size_t is 64 bits. There is a 32 bit overflow check
in sha1_update(), which will not work correctly, because compiler will
do an automatic cast to 64 bits, since size_t type variable is in the
expression. We do want however to lose data, since this is the whole
idea of this overflow check.
Because of this, computation of SHA-1 checksum will always be incorrect
for any data, that is bigger than 512 megabytes, which in bits is the
boundary of 32 bits integer.
In practice it means that any OVSDB transaction, bigger or equal to 512
megabytes, is considered corrupt and ovsdb-server will refuse to work
with the database file. This is especially critical for OVN southbound
database, since it tends to grow rapidly.
Fixes: 5eccf359391f ("Replace SHA-1 library with one that is clearly licensed.")
Signed-off-by: Renat Nurgaliyev <impleman at gmail.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 51c7bf01c233a2ffb014dfa5ea1a22641aeb483a
https://github.com/openvswitch/ovs/commit/51c7bf01c233a2ffb014dfa5ea1a22641aeb483a
Author: Vincent Bernat <vincent at bernat.ch>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/lldp/lldp.c
Log Message:
-----------
lldp: validate a bit more received LLDP frames
Upstream commit:
commit 3aeae72b97716fddac290634fad02b952d981f17
Author: Vincent Bernat <vincent at bernat.ch>
Date: Tue, 1 Oct 2019 21:42:42 +0200
lldp: validate a bit more received LLDP frames
Notably, we ensure the order and unicity of Chassis ID, Port ID and
TTL TLV. For Chassis ID and Port ID, we also ensure the maximum size
does not exceed 256.
Fix https://github.com/vincentbernat/lldpd/issues/351
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
Signed-off-by: Aaron Conole <aconole at redhat.com>
Co-authored-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 7d1d61863ea7e9fd7a3c21dacedf2fd13e7c2258
https://github.com/openvswitch/ovs/commit/7d1d61863ea7e9fd7a3c21dacedf2fd13e7c2258
Author: Jonas Johansson <jonasj76 at gmail.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/lldp/lldp.c
Log Message:
-----------
lldp: Fix size of PEEK_DISCARD_UINT32()
Upstream commit:
commit a8d8006c06d9ac16ebcf33295cbd625c0847ca9b
Author: Jonas Johansson <jonasj76 at gmail.com>
Date: Thu, 21 Apr 2016 11:50:06 +0200
Fix size of PEEK_DISCARD_UINT32()
Signed-off-by: Jonas Johansson <jonasj76 at gmail.com>
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
Reported-by: Jonas Rudloff <jonas.t.rudloff at gmail.com>
Reported-at: https://github.com/openvswitch/ovs/pull/336
Signed-off-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 751b05b81c7f056c58c78ffb183e8746b8214914
https://github.com/openvswitch/ovs/commit/751b05b81c7f056c58c78ffb183e8746b8214914
Author: Vincent Bernat <vincent at bernat.im>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/lldp/lldp.c
Log Message:
-----------
lldp: fix a buffer overflow when handling management address TLV
Upstream commit:
commit a8d8006c06d9ac16ebcf33295cbd625c0847ca9b
Author: Vincent Bernat <vincent at bernat.im>
Date: Sun, 4 Oct 2015 01:50:38 +0200
lldp: fix a buffer overflow when handling management address TLV
When a remote device was advertising a too large management address
while still respecting TLV boundaries, lldpd would crash due to a buffer
overflow. However, the buffer being a static one, this buffer overflow
is not exploitable if hardening was not disabled. This bug exists since
version 0.5.6.
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
Reported-by: Jonas Rudloff <jonas.t.rudloff at gmail.com>
Reported-at: https://github.com/openvswitch/ovs/pull/335
Co-authored-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Signed-off-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 6b2bae3615798b939387ccf4e91af14f081f8c75
https://github.com/openvswitch/ovs/commit/6b2bae3615798b939387ccf4e91af14f081f8c75
Author: Vincent Bernat <vincent at bernat.ch>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/lldp/lldp.c
Log Message:
-----------
lldp: increase statsTLVsUnrecognizedTotal on unknown TLV
Upstream commit:
commit 109bcd423cd560545ec7940d73a50c5584aebb0c
Author: Vincent Bernat <vincent at bernat.ch>
Date: Sat, 6 Apr 2019 21:17:25 +0200
This was done for organization TLVs, but not for other TLVs.
Fix https://github.com/vincentbernat/lldpd/issues/323
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
Signed-off-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: e9495d4aeee7ed8084b30d5bea270abd353cd1ef
https://github.com/openvswitch/ovs/commit/e9495d4aeee7ed8084b30d5bea270abd353cd1ef
Author: Vincent Bernat <vincent at bernat.im>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/lldp/lldpd.c
Log Message:
-----------
lldp: correctly increase discarded count
Upstream commit:
commit 32f0deeebc9172c3f5f4a4d02aab32e6904947f6
Date: Sat, 18 Feb 2017 20:11:47 +0100
lldpd: correctly increase discarded count
When a frame cannot be decoded but has been guessed, increase the
discarded count.
Fix https://github.com/vincentbernat/lldpd/issues/223
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
Co-authored-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Signed-off-by: Fabrizio D'Angelo <fdangelo at redhat.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 9d17f7b186616ec8720e388a3d6cf22783775aab
https://github.com/openvswitch/ovs/commit/9d17f7b186616ec8720e388a3d6cf22783775aab
Author: Terry Wilson <twilson at redhat.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M python/ovs/stream.py
Log Message:
-----------
python: Don't raise an Exception on failure to connect via SSL.
With other socket types, trying to connect and failing will return
an error code, but if an SSL Stream is used, then when
check_connection_completion(sock) is called, SSL will raise an
exception that doesn't derive from socket.error which is handled.
This adds handling for SSL.SysCallError which has the same
arguments as socket.error (errno, string). A future enhancement
could be to go through SSLStream class and implement error
checking for all of the possible exceptions similar to how
lib/stream-ssl.c's interpret_ssl_error() works across the various
methods that are implemented.
Fixes: d90ed7d65ba8 ("python: Add SSL support to the python ovs client library")
Signed-off-by: Terry Wilson <twilson at redhat.com>
Acked-by: Thomas Neuman <thomas.neuman at nutanix.com>
Acked-by: Mark Michelson <mmichels at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 83fb2530f8538f44a0d066abac093f588d37dc66
https://github.com/openvswitch/ovs/commit/83fb2530f8538f44a0d066abac093f588d37dc66
Author: Timothy Redaelli <tredaelli at redhat.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M lib/nx-match.c
Log Message:
-----------
ofp-actions: Fix userspace support for mpls_ttl.
Currently mpls_ttl is ignored when a flow is added because MFF_MPLS_TTL is
not handled in nx_put_raw().
This commit adds the correct handling of MFF_MPLS_TTL in nx_put_raw().
Fixes: bef3f465bcd5 ("openflow: Support matching and modifying MPLS TTL field.")
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: c9a60a7a8fb6ab3d7b179077beb0f69e2998053c
https://github.com/openvswitch/ovs/commit/c9a60a7a8fb6ab3d7b179077beb0f69e2998053c
Author: Timothy Redaelli <tredaelli at redhat.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M tests/ovs-ofctl.at
Log Message:
-----------
tests: Add parse-flow tests for MPLS fields.
Currently "ovs-ofctl parse-flows (NXM)" test doesn't test MPLS fields at all.
This commit adds a test for the the 4 MPLS fields (mpls_label, mpls_tc,
mpls_bos and mpls_ttl) to "ovs-ofctl parse-flows (NXM)" test.
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 11a31ac4cb6a1020414ead5852d4f4f6a4c6e381
https://github.com/openvswitch/ovs/commit/11a31ac4cb6a1020414ead5852d4f4f6a4c6e381
Author: Greg Rose <gvrose8192 at gmail.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M acinclude.m4
M datapath/linux/compat/include/linux/percpu.h
M datapath/linux/compat/include/linux/skbuff.h
Log Message:
-----------
compat: Remove stale code.
Remove stale and unused code left over after support for kernels
older than 3.10 was removed.
Fixes: 8063e0958780 ("datapath: Drop support for kernel older than 3.10")
Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Commit: 09576003196beb1b1348b8563e23f335e73e01a3
https://github.com/openvswitch/ovs/commit/09576003196beb1b1348b8563e23f335e73e01a3
Author: Greg Rose <gvrose8192 at gmail.com>
Date: 2020-11-16 (Mon, 16 Nov 2020)
Changed paths:
M datapath/linux/compat/nf_conntrack_reasm.c
Log Message:
-----------
compat: Fix compile warning.
In ../compat/nf_conntrack_reasm.c nf_frags_cache_name is declared
if OVS_NF_DEFRAG6_BACKPORT is defined. However, later in the patch
it is only used if HAVE_INET_FRAGS_WITH_FRAGS_WORK is defined and
HAVE_INET_FRAGS_RND is not defined. This will cause a compile warning
about unused variables.
Fix it up by using the same defines that enable its use to decide
if it should be declared and avoid the compiler warning.
Fixes: 4a90b277baca ("compat: Fixup ipv6 fragmentation on 4.9.135+ kernels")
Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Compare: https://github.com/openvswitch/ovs/compare/604cbb45b970...09576003196b
More information about the git
mailing list