summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 15:20:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 15:20:56 -0800
commit6de29ccb50f2caef07cdd888efc8cb933497b6a4 (patch)
treec08336d487fb8f275e9ded66b4a648abbac7d39e /net
parent69234acee54407962a20bedf90ef9c96326994b5 (diff)
parentf2ca379642d7a843be972ea4167abdd3c8c9e5d1 (diff)
downloadop-kernel-dev-6de29ccb50f2caef07cdd888efc8cb933497b6a4.zip
op-kernel-dev-6de29ccb50f2caef07cdd888efc8cb933497b6a4.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull userns hardlink capability check fix from Eric Biederman: "This round just contains a single patch. There has been a lot of other work this period but it is not quite ready yet, so I am pushing it until 4.5. The remaining change by Dirk Steinmetz wich fixes both Gentoo and Ubuntu containers allows hardlinks if we have the appropriate capabilities in the user namespace. Security wise it is really a gimme as the user namespace root can already call setuid become that user and create the hardlink" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: namei: permit linking with CAP_FOWNER in userns
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud