- 5.13.5

[packages/kernel.git] / kernel-pom-ng-IPV4OPTSSTRIP.patch

diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index 9fe3fb32f2509d9a3be9d67dd149b25d75ca057e..ae696e136e0c4aca3edea4d58fb14b0ba8fc6250 100644 (file)
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -1,9 +1,9 @@
-diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig linux-2.6.21.a/net/ipv4/netfilter/Kconfig
---- linux-2.6.21.b/net/ipv4/netfilter/Kconfig  2007-05-30 11:11:52.000000000 +0200
-+++ linux-2.6.21.a/net/ipv4/netfilter/Kconfig  2007-05-30 11:18:08.000000000 +0200
-@@ -668,5 +668,15 @@ config IP_NF_ARP_MANGLE
-         Allows altering the ARP packet payload: source and destination
-         hardware and network addresses.
+diff -ur linux-5.9/net/ipv4/netfilter.org/Kconfig linux-5.9/net/ipv4/netfilter/Kconfig
+--- linux-5.9/net/ipv4/netfilter.org/Kconfig   2020-10-11 23:15:50.000000000 +0200
++++ linux-5.9/net/ipv4/netfilter/Kconfig       2020-11-03 13:07:22.874511004 +0100
+@@ -356,5 +356,15 @@
+ 
+ endif # IP_NF_ARPTABLES
  
 +config IP_NF_TARGET_IPV4OPTSSTRIP
 +      tristate  'IPV4OPTSSTRIP target support'
@@ -17,16 +17,17 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig linux-2.6.21.a/n
 +
  endmenu
  
---- linux-3.4/net/ipv4/netfilter/Makefile~     2012-05-21 08:42:02.000000000 +0200
-+++ linux-3.4/net/ipv4/netfilter/Makefile      2012-05-21 08:45:09.247956356 +0200
-@@ -54,6 +54,7 @@
+diff -ur linux-5.9/net/ipv4/netfilter.org/Makefile linux-5.9/net/ipv4/netfilter/Makefile
+--- linux-5.9/net/ipv4/netfilter.org/Makefile  2020-10-11 23:15:50.000000000 +0200
++++ linux-5.9/net/ipv4/netfilter/Makefile      2020-11-03 13:07:22.874511004 +0100
+@@ -48,6 +48,7 @@
  # targets
  obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 +obj-$(CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP) += ipt_IPV4OPTSSTRIP.o
- obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
- obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
+ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
+ obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o
+ 
 diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c
 --- linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c      1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c      2007-05-30 11:18:08.000000000 +0200
@@ -57,7 +58,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
 +      unsigned char *optiph;
 +      int l;
 +      
-+      if (!skb_make_writable(skb, skb->len))
++      if (skb_ensure_writable(skb, skb->len))
 +              return NF_DROP;
 + 
 +      iph = ip_hdr(skb);