[vserver] linux 3.10.55 and patch-3.10.53-vs2.3.6.8.diff

From: Corey Wright <undefined_at_pobox.com>
Date: Fri 19 Sep 2014 - 07:07:55 BST
Message-Id: <20140919010755.3c3d79a02daec74c98ccbbc0@pobox.com>

applying patch-3.10.53-vs2.3.6.8.diff to linux 3.10.55 fails in both patching
and testing/functionality.

the upstream addition of including "linux/hash.h" in "fs/namei.c" [1]
invalidated the patch hunk context.

patching file fs/namei.c
Hunk #1 FAILED at 34.
Hunk #2 succeeded at 267 (offset 1 line).
Hunk #3 succeeded at 473 (offset 1 line).
Hunk #4 succeeded at 1327 (offset 1 line).
Hunk #5 succeeded at 1473 (offset 1 line).
Hunk #6 succeeded at 1506 (offset 1 line).
1 out of 16 hunks FAILED -- saving rejects to file fs/namei.c.rej

[1] https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=d4c96061fddd129778ce8b70fb093aa532f422d0

the upstream change of masking all capabilities above CAP_LAST_CAP (which the
linux-vserver patch does not adjust to account for its own CAP_CONTEXT)
breaks changing/manipulating contexts.

# vserver-info | grep V

Assumed 'SYSINFO' as no other option given; try '--help' for more information.
                   VS-API: ???
                      VCI: ???
# chcontext --xid 1 -- true
chcontext: vc_new_s_context(): Function not implemented

[2] https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=76f01555c78e496203105bd29b878db3431a2260

the attached patch accounts for the change in patch hunk context. reverting
the upstream commit accounts for the masking of CAP_CONTEXT.

1. acquire linux-3.10.55
2. apply patch-3.10.53-vs2.3.6.8
3. revert upstream git commit 76f0155
  a. wget -Nv --content-disposition https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=76f01555c78e496203105bd29b878db3431a2260
b. patch -R <d4281c33c1086d80b2a5e3cd6081752e75795833..76f01555c78e496203105bd29b878db3431a2260.patch
4. apply the attached patch-3.10.53-55-vs2.3.6.8.diff
5. manually fix the Makefile reject (EXTRAVERSION)

i've successfully built the resulting kernel and tested it in virtualbox
against testme.sh and testfs.sh and started-entered-exited-stopped a vserver

i figure in time herbert will release an updated kernel patch that addresses
the upstream change in capability masking (though i have a few ideas of my
own, but this upstream change is immaterial enough that it's easier to just
revert it for now).



Received on Fri Sep 19 07:08:10 2014
[Next/Previous Months] [Main vserver Project Homepage] [Howto Subscribe/Unsubscribe] [Paul Sladen's vserver stuff]
Generated on Fri 19 Sep 2014 - 07:08:10 BST by hypermail 2.1.8