diff mbox series

[ovs-dev,V2,branch-2.6,2/2] datapath: Clear the L4 portion of the key for "later" fragments

Message ID 1567616831-5652-2-git-send-email-gvrose8192@gmail.com
State Accepted
Headers show
Series [ovs-dev,V2,branch-2.6,1/2] datapath: Properly set L4 keys on "later" IP fragments | expand

Commit Message

Gregory Rose Sept. 4, 2019, 5:07 p.m. UTC 
From: Justin Pettit <jpettit@ovn.org>

Upstream commit:
    commit 0754b4e8cdf3eec6e4122e79af26ed9bab20f8f8
    Author: Justin Pettit <jpettit@ovn.org>
    Date:   Tue Aug 27 07:58:10 2019 -0700

    openvswitch: Clear the L4 portion of the key for "later" fragments.

    Only the first fragment in a datagram contains the L4 headers.  When the
    Open vSwitch module parses a packet, it always sets the IP protocol
    field in the key, but can only set the L4 fields on the first fragment.
    The original behavior would not clear the L4 portion of the key, so
    garbage values would be sent in the key for "later" fragments.  This
    patch clears the L4 fields in that circumstance to prevent sending those
    garbage values as part of the upcall.

    Signed-off-by: Justin Pettit <jpettit@ovn.org>
    Acked-by: Pravin B Shelar <pshelar@ovn.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Greg Rose <gvrose8192@gmail.com>

---
V2 - Fix compile error
---
 datapath/flow.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

0-day Robot Sept. 4, 2019, 6:44 p.m. UTC | #1 
Bleep bloop.  Greetings Greg Rose, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
ERROR: Author Justin Pettit <jpettit@ovn.org> needs to sign off.
WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Greg Rose <gvrose8192@gmail.com>
Lines checked: 56, Warnings: 1, Errors: 1


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
diff mbox series

Patch

diff --git a/datapath/flow.c b/datapath/flow.c
index 2d44997..345cdf6 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -472,6 +472,7 @@  static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key)
 		offset = nh->frag_off & htons(IP_OFFSET);
 		if (offset) {
 			key->ip.frag = OVS_FRAG_TYPE_LATER;
+			memset(&key->tp, 0, sizeof(key->tp));
 			return 0;
 		}
 		if (nh->frag_off & htons(IP_MF) ||
@@ -595,8 +596,10 @@  static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key)
 			return error;
 		}
 
-		if (key->ip.frag == OVS_FRAG_TYPE_LATER)
+		if (key->ip.frag == OVS_FRAG_TYPE_LATER) {
+			memset(&key->tp, 0, sizeof(key->tp));
 			return 0;
+		}
 		if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
 			key->ip.frag = OVS_FRAG_TYPE_FIRST;