commit ba1bcead43a1c92e92dc94d4b3b9bdd748d3ee0b
Author: Chenbo Xia <chenbo.xia>
Date:   Mon Feb 14 16:32:37 2022 +0800

    vhost: fix queue number check when setting inflight FD
    
    [ upstream commit 6442c329b9d2ded0f44b27d2016aaba8ba5844c5 ]
    
    In function vhost_user_set_inflight_fd, queue number in inflight
    message is used to access virtqueue. However, queue number could
    be larger than VHOST_MAX_VRING and cause write OOB as this number
    will be used to write inflight info in virtqueue structure. This
    patch checks the queue number to avoid the issue and also make
    sure virtqueues are allocated before setting inflight information.
    
    Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information")
    
    Reported-by: Wenxiang Qian <leonwxqian>
    Signed-off-by: Chenbo Xia <chenbo.xia>
    Reviewed-by: Maxime Coquelin <maxime.coquelin>

commit 9d20e2fe6296dcf811febc5ad648b3d4c45f6e79
Author: David Marchand <david.marchand>
Date:   Tue Jan 18 15:53:30 2022 +0100

    vhost: fix FD leak with inflight messages
    
    [ upstream commit af74f7db384ed149fe42b21dbd7975f8a54ef227 ]
    
    Even if unlikely, a buggy vhost-user master might attach fds to inflight
    messages. Add checks like for other types of vhost-user messages.
    
    Fixes: d87f1a1cb7b6 ("vhost: support inflight info sharing")
    
    Signed-off-by: David Marchand <david.marchand>
    Reviewed-by: Maxime Coquelin <maxime.coquelin>

commit 885e0d0ad5fe1b321c30d2cb212f0ee1028a3e48
Merge: 87fde112c cbed56773
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Apr 27 17:49:11 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    cbed56773f ofproto-dpif-xlate: Clear out vlan flow fields while processing native tunnel. (#393566
    2060552)

commit 87fde112ca4695b9521935ab8731382b1a9ae2e5
Merge: 4c53699c3 09759f995
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Apr 26 18:50:08 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    09759f9957 ofproto-xlate: Fix crash when forwarding packet between legacy_l3 tunnels.
    dd6e5983a8 system-traffic: Fix fragment reassembly with L3 L4 protocol information.

commit 4c53699c3e1fca27b8638483864c3e07b08495bc
Author: Timothy Redaelli <tredaelli>
Date:   Thu Apr 21 14:18:21 2022 +0200

    Really set RTE_ETH_MAXPORTS to 1024
    
    Fixes: cbe02d895f52 ("Change RTE_ETH_MAXPORTS to 1024")

commit c55ba17247843d923e3894e66155feebb9e7793c
Merge: c8842bbbf 3da1b0c45
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Apr 18 13:51:24 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    3da1b0c456 cirrus: Update FreeBSD versions.

commit c8842bbbf94df771448f8db962fe6ccc851bcd99
Merge: 74dde447f 27a2daad0
Author: Open vSwitch CI <ovs-ci>
Date:   Fri Apr 8 13:15:17 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    27a2daad0e Prepare for 2.15.5.
    c281f01dd3 Set release date for 2.15.4.

commit 74dde447f6cbd6a12690feaf6a03575986b54b78
Merge: 09b0ffda3 d848639d2
Author: Open vSwitch CI <ovs-ci>
Date:   Fri Apr 8 10:05:19 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    d848639d27 NEWS: Highlight libopenvswitch API change caused by UB fixes.

commit 09b0ffda3293a8566f85baeedad568faba7df450
Merge: 9e3e8cde3 3719bdafc
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Apr 6 10:05:17 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    3719bdafc4 netdev-offload-tc: Check for ct_state flag combinations that are not offloadable.

commit 9e3e8cde3ca6138dca549ba12584ad0e29a1f4b1
Merge: c42b42c1d 80b57ee01
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Apr 5 14:50:41 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    80b57ee01f dpif-netdev: Fix dp_netdev_get_pmd() function getting correct core_id.
    c1bbb1ec6d ofproto-dpif-xlate: Fix NULL pointer dereference in xlate_normal().

commit c42b42c1dcca4f8334ca41e0a16b5009da9e3986
Merge: a03b5c62e beaea8682
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 30 18:16:43 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    beaea86825 sparse: bump recommended version and include headers.
    4744b939c1 rculist: use multi-variable helpers for loop macros.
    ab4f0e6fd3 hindex: use multi-variable iterators.
    b1c7d8a278 cmap: use multi-variable iterators.
    fa11ec93e1 hmap: implement UB-safe hmap pop iterator.
    5f70b45cd7 hmap: use multi-variable helpers for hmap loops.
    2cbb77724e list: use multi-variable helpers for list loops.
    e345d7bf2a util: add helpers to overload SAFE macro.
    842d7f6814 util: add safe multi-variable iterators.
    f1625aa4d3 util: add multi-variable loop iterator macros.

commit a03b5c62e4030167a932da0e2e34dfc2c13d0c85
Merge: bba298f05 0a3867a9a
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 30 14:04:45 2022 -0400

    Merging upstream branch-2.15
    
    Commit list:
    0a3867a9a9 ovsdb: raft: Fix inability to read the database with DNS host names. (#2055097)