On Tue, 5 Nov 2013 07:35:37 -0600
Corey Wright <undefined@pobox.com> wrote:
> patch-3.10.17-vs2.3.6.6.diff appears to apply to linux-3.10.18, but patch
> (using version 2.6.1) fuzzes incorrectly with net/core/sock.c (ie "Hunk #6
> succeeded at 2495 with fuzz 2 (offset 205 lines)") due to the following
> change in 3.10.18:
>
> * http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/net/core/sock.c?h=linux-3.10.y&id=5e25ba5003ee5de0ba2be56bfd54d16d4b1b028d
>
> the attached patch fixes that bad fuzz and the Makefile reject (ie
> "EXTRAVERSION = -vs2.3.6.6"). apply the patch after applying
> patch-3.10.17-vs2.3.6.6.diff to linux-3.10.18.
>
> there's the slightest chance that my placement of hunk #6 should have come
> before the newly introduced "sk->sk_pacing_rate = ~0U;", but my brief
> analysis of hunk #6 says it doesn't concern itself with sk->sk_pacing_rate
> (only sk->sk_vx_info, sk->sk_xid, sk->sk_nx_info, & sk->sk_nid) so it doesn't
> matter, but i could be wrong.
>
> attached is also a patch to include the deltas (fixes and features) found
> since patch-3.10.17-vs2.3.6.6.diff was released (which i either personally
> tested or have included in a linux-3.10.17-vs2.3.6.6.3 kernel which i've been
> running "in production" for at least 48 hours).
>
> and finally i've included a patch to allow for vserver experimental features
> as CONFIG_EXPERIMENTAL has been removed from 3.10 (starting with 3.9?) so it
> is currently impossible to enable them (without the attached patch). the
> experimental features are defaulted to "n", though VSERVER_AUTO_SINGLE use to
> default to "y", but only when CONFIG_EXPERIMENTAL was enabled (so the true,
> overall "default" was implicitly "n").
>
> the resulting linux-3.10.18-vs2.3.6.6 (with all three attached patches
> applied) boots in virtualbox and passes testme.sh and testfs.sh.
3.10.19 appears to deviate little, if at all, from 3.10.18 in regard to
patching with patch-3.10.17-vs2.3.6.6.diff.
so either follow the previous/above instructions for 3.10.18, but using them
for 3.10.19 (and manually setting EXTRAVERSION in Makefile) or apply the
attached set of patches (after applying patch-3.10.17-vs2.3.6.6.diff to
linux-3.10.19).
* patch-3.10.17-19-vs2.3.6.6.diff
* merging of previous fixups & deltas patches
* includes fixes, features, and repairing a bad fuzz
* patch-3.10.19-vs2.3.6.6-remove_depends_on_EXPERIMENTAL.patch
* allows enabling linux-vserver features marked experimental
the resulting kernel has been successfully built for x86-64 and tested
against testme.sh and testfs.sh in virtualbox.
corey
-- undefined@pobox.com > corey > -- > undefined@pobox.com