From 12eee27c59405812cbb8847b6c6d133a1e52ca1e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 27 Apr 2007 14:28:08 -0700 Subject: [PATCH] 2.6.20.10 --- .../fix-for-rt0-header-ipv6-change.patch | 29 +++++++++++++++ .../fix-oops-er-added-to-netlink-fib.patch | 36 +++++++++++++++++++ releases/2.6.20.10/series | 2 ++ 3 files changed, 67 insertions(+) create mode 100644 releases/2.6.20.10/fix-for-rt0-header-ipv6-change.patch create mode 100644 releases/2.6.20.10/fix-oops-er-added-to-netlink-fib.patch create mode 100644 releases/2.6.20.10/series diff --git a/releases/2.6.20.10/fix-for-rt0-header-ipv6-change.patch b/releases/2.6.20.10/fix-for-rt0-header-ipv6-change.patch new file mode 100644 index 00000000000..14d7474ce1c --- /dev/null +++ b/releases/2.6.20.10/fix-for-rt0-header-ipv6-change.patch @@ -0,0 +1,29 @@ +From davem@davemloft.net Fri Apr 27 02:12:58 2007 +From: YOSHIFUJI Hideaki +Date: Fri, 27 Apr 2007 02:13:02 -0700 (PDT) +Subject: IPV6: Fix for RT0 header ipv6 change. +To: greg@kroah.com +Message-ID: <20070427.021302.106266194.davem@davemloft.net> + +From: YOSHIFUJI Hideaki + +[IPV6]: Fix thinko in ipv6_rthdr_rcv() changes. + +Signed-off-by: YOSHIFUJI Hideaki +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv6/exthdrs.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/ipv6/exthdrs.c ++++ b/net/ipv6/exthdrs.c +@@ -397,6 +397,7 @@ static int ipv6_rthdr_rcv(struct sk_buff + + switch (hdr->type) { + #ifdef CONFIG_IPV6_MIP6 ++ case IPV6_SRCRT_TYPE_2: + break; + #endif + case IPV6_SRCRT_TYPE_0: diff --git a/releases/2.6.20.10/fix-oops-er-added-to-netlink-fib.patch b/releases/2.6.20.10/fix-oops-er-added-to-netlink-fib.patch new file mode 100644 index 00000000000..a0a8528ea7b --- /dev/null +++ b/releases/2.6.20.10/fix-oops-er-added-to-netlink-fib.patch @@ -0,0 +1,36 @@ +From davem@davemloft.net Fri Apr 27 02:18:34 2007 +From: Sergey Vlasov +Date: Fri, 27 Apr 2007 02:18:35 -0700 (PDT) +Subject: IPV4: Fix OOPS'er added to netlink fib. +To: greg@kroah.com +Message-ID: <20070427.021835.115909046.davem@davemloft.net> + +From: Sergey Vlasov + +[IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res) + +When CONFIG_IP_MULTIPLE_TABLES is enabled, the code in nl_fib_lookup() +needs to initialize the res.r field before fib_res_put(&res) - unlike +fib_lookup(), a direct call to ->tb_lookup does not set this field. + +Signed-off-by: Sergey Vlasov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv4/fib_frontend.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/net/ipv4/fib_frontend.c ++++ b/net/ipv4/fib_frontend.c +@@ -773,6 +773,10 @@ static void nl_fib_lookup(struct fib_res + .tos = frn->fl_tos, + .scope = frn->fl_scope } } }; + ++#ifdef CONFIG_IP_MULTIPLE_TABLES ++ res.r = NULL; ++#endif ++ + frn->err = -ENOENT; + if (tb) { + local_bh_disable(); diff --git a/releases/2.6.20.10/series b/releases/2.6.20.10/series new file mode 100644 index 00000000000..4be08e68a02 --- /dev/null +++ b/releases/2.6.20.10/series @@ -0,0 +1,2 @@ +fix-oops-er-added-to-netlink-fib.patch +fix-for-rt0-header-ipv6-change.patch -- 2.47.3