Sun, 1 Jun 2014 14:49:49 -0500
applying patch-3.10.40-vs2.3.6.8.diff to linux-3.10.41 fails.
the upstream change of saving an return/error code to a local variable (for
more elaborate testing in later statements) instead of testing it within a
conditional [1] invalidates a patch context and causes the patch hunk to fail.
patching file net/core/rtnetlink.c
Hunk #1 FAILED at 1059.
Hunk #2 succeeded at 1962 (offset 11 lines).
1 out of 2 hunks FAILED -- saving rejects to file net/core/rtnetlink.c.rej
[1]
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=1ab27dd7edb75bc3034daab503a912647bdf95ba
the attached patch corrects the patch context, but doesn't change the
linux-vserver logic, and fixes Makefile's EXTRAVERSION, too.
instructions:
1. acquire linux-3.10.41
2. apply patch-3.10.40-vs2.3.6.8.diff
3. apply the attached patch-3.10.40-41-vs2.3.6.8.diff
i've successfully built the resulting kernel and tested it against testme.sh
and testfs.sh in virtualbox.
corey
--
undefined@pobox.com
diff -urNpd a/linux-3.10.41-vs2.3.6.8/Makefile b/linux-3.10.41-vs2.3.6.8/Makefile
--- a/linux-3.10.41-vs2.3.6.8/Makefile 2014-05-31 23:54:17.000000000 -0500
+++ b/linux-3.10.41-vs2.3.6.8/Makefile 2014-06-01 00:13:48.000000000 -0500
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 10
SUBLEVEL = 41
-EXTRAVERSION =
+EXTRAVERSION = -vs2.3.6.8
NAME = TOSSUG Baby Fish
# *DOCUMENTATION*
diff -urNpd a/linux-3.10.41-vs2.3.6.8/net/core/rtnetlink.c b/linux-3.10.41-vs2.3.6.8/net/core/rtnetlink.c
--- a/linux-3.10.41-vs2.3.6.8/net/core/rtnetlink.c 2014-06-01 00:19:14.000000000 -0500
+++ b/linux-3.10.41-vs2.3.6.8/net/core/rtnetlink.c 2014-06-01 00:10:29.000000000 -0500
@@ -1064,6 +1064,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
+ if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
+ continue;
err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, 0,