diff options
| author |   Andrew Yourtchenko <ayourtch@gmail.com> | 2023-03-17 01:47:58 +0000 |
|---|---|---|
| committer | Andrew Yourtchenko <ayourtch@gmail.com> | 2023-04-12 15:26:23 +0000 |
| commit | feb77422a3435f4fd25c3a6e12df1bb9526b342a (patch) | |
| tree | e1ecb2ba6c1c8e30225db6d916e7a67b563b3ed0 /src | |
| parent | 393a05f2897db8459a660eb631a25ced2212115d (diff) | |
ip: punt socket - take the tags in Ethernet header into consideration
The punt socket code rewinds the current_data pointer by sizeof (ethernet_header_t),
which is incorrect if the header is tagged - resulting in truncated destination MAC
address. Use ethernet_buffer_header_size() instead, which takes tags into account.
Also add the unittest that verifies the issue and the fix.
Type: fix
Change-Id: I6352a174df144ca1e4230390c126f4b698724ebc
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vnet/ip/punt_node.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vnet/ip/punt_node.c b/src/vnet/ip/punt_node.c index 7f9beef0ffe..5d822c73759 100644 --- a/src/vnet/ip/punt_node.c +++ b/src/vnet/ip/punt_node.c @@ -23,6 +23,7 @@ */ #include <vnet/ip/ip.h> +#include <vnet/ethernet/ethernet.h> #include <vlib/vlib.h> #include <vnet/ip/punt.h> #include <vlib/unix/unix.h> @@ -339,7 +340,7 @@ punt_socket_inline (vlib_main_t * vm, iov->iov_len = sizeof (packetdesc); /** VLIB buffer chain -> Unix iovec(s). */ - vlib_buffer_advance (b, -(sizeof (ethernet_header_t))); + vlib_buffer_advance (b, -ethernet_buffer_header_size (b)); vec_add2 (ptd->iovecs, iov, 1); iov->iov_base = b->data + b->current_data; iov->iov_len = l = b->current_length; |