- rediffed patches for fuzz 0

diff --git a/esfq-iproute2.patch b/esfq-iproute2.patch
index 99c03345b71a4f099b8248fa96dfcda3b28328da..196d81cb6c5f1d93c300e08daeaca3a041423a71 100644 (file)
--- a/esfq-iproute2.patch
+++ b/esfq-iproute2.patch
@@ -38,17 +38,16 @@ diff -Naur iproute2-2.6.19-061214.orig/include/uapi/linux/pkt_sched.h iproute2-2
  /* RED section */
  
  enum {
  /* RED section */
  
  enum {

-diff -Naur iproute2-2.6.19-061214.orig/tc/Makefile iproute2-2.6.19-061214/tc/Makefile
---- iproute2-2.6.19-061214.orig/tc/Makefile    2006-12-14 15:04:12.000000000 -0800
-+++ iproute2-2.6.19-061214/tc/Makefile 2007-02-11 11:56:13.000000000 -0800
-@@ -7,6 +7,7 @@
+--- iproute2-5.10.0/tc/Makefile.orig   2021-02-24 19:28:31.498889761 +0100
++++ iproute2-5.10.0/tc/Makefile        2021-02-24 19:29:13.547728259 +0100
+@@ -10,6 +10,7 @@

  TCMODULES :=
  TCMODULES += q_fifo.o
  TCMODULES += q_sfq.o
 +TCMODULES += q_esfq.o
  TCMODULES += q_red.o
  TCMODULES += q_prio.o
  TCMODULES :=
  TCMODULES += q_fifo.o
  TCMODULES += q_sfq.o
 +TCMODULES += q_esfq.o
  TCMODULES += q_red.o
  TCMODULES += q_prio.o

- TCMODULES += q_tbf.o
+ TCMODULES += q_skbprio.o

 diff -Naur iproute2-2.6.19-061214.orig/tc/q_esfq.c iproute2-2.6.19-061214/tc/q_esfq.c
 --- iproute2-2.6.19-061214.orig/tc/q_esfq.c    1969-12-31 16:00:00.000000000 -0800
 +++ iproute2-2.6.19-061214/tc/q_esfq.c 2007-02-13 23:18:26.000000000 -0800
 diff -Naur iproute2-2.6.19-061214.orig/tc/q_esfq.c iproute2-2.6.19-061214/tc/q_esfq.c
 --- iproute2-2.6.19-061214.orig/tc/q_esfq.c    1969-12-31 16:00:00.000000000 -0800
 +++ iproute2-2.6.19-061214/tc/q_esfq.c 2007-02-13 23:18:26.000000000 -0800

diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index 1f9ca05190f752810922b4dae028c8e50e375f5f..d2233fd9dcd566984f34465632d1bb221af443d0 100644 (file)
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -1,19 +1,16 @@
-diff -urN iproute-2.6.20-070313-orig/tc/Makefile iproute-2.6.20-070313/tc/Makefile
---- iproute-2.6.20-070313-orig/tc/Makefile     2007-03-13 22:50:56.000000000 +0100
-+++ iproute-2.6.20-070313/tc/Makefile  2007-04-15 20:52:33.000000000 +0200
-@@ -11,6 +11,7 @@
- TCMODULES += q_tbf.o
- TCMODULES += q_cbq.o
+--- iproute2-5.10.0/tc/Makefile.orig   2021-02-24 19:25:55.137480328 +0100
++++ iproute2-5.10.0/tc/Makefile        2021-02-24 19:26:32.562746684 +0100
+@@ -20,6 +20,7 @@

  TCMODULES += q_netem.o
  TCMODULES += q_netem.o

-+TCMODULES += q_wrr.o

  TCMODULES += q_choke.o
  TCMODULES += q_sfb.o
  TCMODULES += q_choke.o
  TCMODULES += q_sfb.o

++TCMODULES += q_wrr.o

  TCMODULES += f_rsvp.o
  TCMODULES += f_u32.o
  TCMODULES += f_rsvp.o
  TCMODULES += f_u32.o

-diff -urN iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h
---- iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h  2007-03-13 22:50:56.000000000 +0100
-+++ iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h       2007-04-15 20:52:33.000000000 +0200
-@@ -466,4 +498,117 @@
+ TCMODULES += f_route.o
+--- iproute2-5.10.0/include/uapi/linux/pkt_sched.h.orig        2021-02-24 19:26:51.060368757 +0100
++++ iproute2-5.10.0/include/uapi/linux/pkt_sched.h     2021-02-24 19:28:08.234354809 +0100
+@@ -676,6 +676,119 @@

  #define NETEM_DIST_SCALE      8192
  #define NETEM_DIST_MAX                16384
  
  #define NETEM_DIST_SCALE      8192
  #define NETEM_DIST_MAX                16384
  


@@ -131,7 +128,8 @@ diff -urN iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h iproute-2.6.
 +};
 +
  /* DRR */
 +};
 +
  /* DRR */

-
+ 
+ enum {

 diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
 --- iproute-2.6.20-070313-orig/tc/q_wrr.c      1970-01-01 01:00:00.000000000 +0100
 +++ iproute-2.6.20-070313/tc/q_wrr.c   2007-04-15 20:52:33.000000000 +0200
 diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
 --- iproute-2.6.20-070313-orig/tc/q_wrr.c      1970-01-01 01:00:00.000000000 +0100
 +++ iproute-2.6.20-070313/tc/q_wrr.c   2007-04-15 20:52:33.000000000 +0200

diff --git a/iproute2-print_cache_route_entries.patch b/iproute2-print_cache_route_entries.patch
index 704e5ba339710017abe05c0bc8d9b420825e97e3..e22c9870d91e23486f11c8aefcae9741e15f399d 100644 (file)
--- a/iproute2-print_cache_route_entries.patch
+++ b/iproute2-print_cache_route_entries.patch
@@ -1,7 +1,6 @@
-diff -ruNp iproute2-4.2.0.orig/ip/iproute.c iproute2-4.2.0/ip/iproute.c
---- iproute2-4.2.0.orig/ip/iproute.c   2015-09-01 01:31:15.000000000 +0200
-+++ iproute2-4.2.0/ip/iproute.c        2015-10-12 12:06:37.710674199 +0200
-@@ -331,6 +331,9 @@ int print_route(const struct sockaddr_nl
+--- iproute2-5.10.0/ip/iproute.c.orig  2021-02-24 19:23:37.743717387 +0100
++++ iproute2-5.10.0/ip/iproute.c       2021-02-24 19:25:20.642365315 +0100
+@@ -754,6 +754,9 @@

        if (!filter_nlmsg(n, tb, host_len))
                return 0;
  
        if (!filter_nlmsg(n, tb, host_len))
                return 0;
  


@@ -10,4 +9,4 @@ diff -ruNp iproute2-4.2.0.orig/ip/iproute.c iproute2-4.2.0/ip/iproute.c
 +
        if (filter.flushb) {
                struct nlmsghdr *fn;
 +
        if (filter.flushb) {
                struct nlmsghdr *fn;

-               if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
+ 

diff --git a/iproute2-q_srr.v0.4.patch b/iproute2-q_srr.v0.4.patch
index 646f5176db4ad5d75f9e6cad53deb49b060b92a1..ec38750de914c1f09449dbed67922ea6869ceeb3 100644 (file)
--- a/iproute2-q_srr.v0.4.patch
+++ b/iproute2-q_srr.v0.4.patch
@@ -1,9 +1,8 @@
-diff -ruN iproute-20041019/include/uapi/linux/pkt_sched.h iproute-20041019.srr.patched.v0.4/include/uapi/linux/pkt_sched.h
---- iproute-20041019/include/uapi/linux/pkt_sched.h    2006-07-27 13:04:00.000000000 +0300
-+++ iproute-20041019.srr.patched.v0.4/include/uapi/linux/pkt_sched.h   2006-07-27 13:11:36.000000000 +0300
-@@ -550,6 +550,14 @@
-  *    to change these parameters in compile time.
-  */
+--- iproute2-5.10.0/include/uapi/linux/pkt_sched.h.orig        2021-02-24 19:32:20.974075535 +0100
++++ iproute2-5.10.0/include/uapi/linux/pkt_sched.h     2021-02-24 19:33:12.273391823 +0100
+@@ -279,6 +279,14 @@
+       unsigned        hash_kind;      /* Hash function to use for flow identification */
+ };

  
 +/* SRR section */
 +struct tc_srr_qopt {
  
 +/* SRR section */
 +struct tc_srr_qopt {


@@ -15,7 +14,7 @@ diff -ruN iproute-20041019/include/uapi/linux/pkt_sched.h iproute-20041019.srr.p
 +
  /* RED section */
  
 +
  /* RED section */
  

- enum
+ enum {

 diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr.c
 --- iproute-20041019/tc/q_srr.c        1970-01-01 03:00:00.000000000 +0300
 +++ iproute-20041019.srr.patched.v0.4/tc/q_srr.c       2006-07-27 12:59:27.000000000 +0300
 diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr.c
 --- iproute-20041019/tc/q_srr.c        1970-01-01 03:00:00.000000000 +0300
 +++ iproute-20041019.srr.patched.v0.4/tc/q_srr.c       2006-07-27 12:59:27.000000000 +0300


@@ -138,13 +137,13 @@ diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr
 +      .parse_qopt     = srr_parse_opt,
 +      .print_qopt     = srr_print_opt,
 +};
 +      .parse_qopt     = srr_parse_opt,
 +      .print_qopt     = srr_print_opt,
 +};

---- iproute-2.6.22-070710/tc/Makefile.orig     2007-07-18 18:15:46.749073720 +0200
-+++ iproute-2.6.22-070710/tc/Makefile  2007-07-18 18:17:19.296663578 +0200
-@@ -8,6 +8,7 @@
- TCMODULES += q_fifo.o
- TCMODULES += q_sfq.o
- TCMODULES += q_esfq.o
+--- iproute2-5.10.0/tc/Makefile.orig   2021-02-24 19:32:21.377429702 +0100
++++ iproute2-5.10.0/tc/Makefile        2021-02-24 19:33:44.238376154 +0100
+@@ -21,6 +21,7 @@
+ TCMODULES += q_netem.o
+ TCMODULES += q_choke.o
+ TCMODULES += q_sfb.o

 +TCMODULES += q_srr.o
 +TCMODULES += q_srr.o

- TCMODULES += q_red.o
- TCMODULES += q_prio.o
- TCMODULES += q_tbf.o
+ TCMODULES += q_wrr.o
+ TCMODULES += f_rsvp.o
+ TCMODULES += f_u32.o