fix up dccp patch for 4.19 and 4.14

diff --git a/queue-4.14/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch b/queue-4.14/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
index ccf2a80abfc8dbe566d35a31fe4bdee8aac3dbb3..6175ac58ffb32da0de410c47c7234a391cbc93a0 100644 (file)
--- a/queue-4.14/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
+++ b/queue-4.14/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
 +      dh = (struct dccp_hdr *)(skb->data + offset);
 +      if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh)))
-+              return -EINVAL;
++              return;
 +      iph = (struct iphdr *)skb->data;
        dh = (struct dccp_hdr *)(skb->data + offset);
  
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
 +      dh = (struct dccp_hdr *)(skb->data + offset);
 +      if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh)))
-+              return -EINVAL;
++              return;
 +      hdr = (const struct ipv6hdr *)skb->data;
        dh = (struct dccp_hdr *)(skb->data + offset);
  

diff --git a/queue-4.19/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch b/queue-4.19/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
index ccf2a80abfc8dbe566d35a31fe4bdee8aac3dbb3..6175ac58ffb32da0de410c47c7234a391cbc93a0 100644 (file)
--- a/queue-4.19/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
+++ b/queue-4.19/dccp-fix-out-of-bounds-access-in-dccp-error-handler.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
 +      dh = (struct dccp_hdr *)(skb->data + offset);
 +      if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh)))
-+              return -EINVAL;
++              return;
 +      iph = (struct iphdr *)skb->data;
        dh = (struct dccp_hdr *)(skb->data + offset);
  
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
 +      dh = (struct dccp_hdr *)(skb->data + offset);
 +      if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh)))
-+              return -EINVAL;
++              return;
 +      hdr = (const struct ipv6hdr *)skb->data;
        dh = (struct dccp_hdr *)(skb->data + offset);