From ac51da3ec29b19762903fe660343f92d73a00d0b Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 18 Aug 2016 13:33:15 -0700 Subject: [PATCH] sys-kernel/coreos-{kernel,modules,sources}: bump to 4.7.1 z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch is dropped because it is applied upstream in the 4.7.1 patchset. --- ...0-r5.ebuild => coreos-kernel-4.7.1.ebuild} | 2 +- ...-r5.ebuild => coreos-modules-4.7.1.ebuild} | 2 +- .../sys-kernel/coreos-sources/Manifest | 1 + ...-r1.ebuild => coreos-sources-4.7.1.ebuild} | 1 - ...ck-in-file_remove_privs-on-overlayfs.patch | 47 ------------------- 5 files changed, 3 insertions(+), 50 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.7.0-r5.ebuild => coreos-kernel-4.7.1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.7.0-r5.ebuild => coreos-modules-4.7.1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.7.0-r1.ebuild => coreos-sources-4.7.1.ebuild} (96%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.7/z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.0-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.1.ebuild index 1a6a9c3550..2fe3d5d496 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.0-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r1" +COREOS_SOURCE_REVISION="" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.0-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.1.ebuild index 5f7ad1c646..763d6d9dfe 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.0-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r1" +COREOS_SOURCE_REVISION="" inherit coreos-kernel savedconfig DESCRIPTION="CoreOS Linux kernel modules" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index ed75554153..5bc7c4f190 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1 +1,2 @@ DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98 +DIST patch-4.7.1.xz 12272 SHA256 838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e SHA512 3c5d941ac007ca4d6e1a7cc0f967d6d213ff86887c9f11f09012fe18ea20cc9e14776c7fc7475d83162376bd67d19c43fa0313da7439d8312b6a9d800ebc5bc8 WHIRLPOOL 5f25bc5a71e6146dfd2d00e19f8bd2e5aa97b75c090825ddb0c0629951ae6c0a406e31a7864346d9b4a11df1291c478ec4de5b4a1760d35c6558b9d1e60400bb diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.1.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.1.ebuild index 2669aba566..acb91de445 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.0-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.1.ebuild @@ -42,5 +42,4 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0018-SELinux-Check-against-union-label-for-file-operation.patch \ ${PATCH_DIR}/z0019-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \ ${PATCH_DIR}/z0020-Don-t-verify-write-permissions-on-lower-inodes-on-ov.patch \ - ${PATCH_DIR}/z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.7/z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.7/z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch deleted file mode 100644 index 5859c2bf45..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.7/z0021-vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bfae341a7c75db3a82912217236924d4cbb87448 Mon Sep 17 00:00:00 2001 -From: Miklos Szeredi -Date: Wed, 3 Aug 2016 13:44:27 +0200 -Subject: [PATCH 21/21] vfs: fix deadlock in file_remove_privs() on overlayfs - -file_remove_privs() is called with inode lock on file_inode(), which -proceeds to calling notify_change() on file->f_path.dentry. Which triggers -the WARN_ON_ONCE(!inode_is_locked(inode)) in addition to deadlocking later -when ovl_setattr tries to lock the underlying inode again. - -Fix this mess by not mixing the layers, but doing everything on underlying -dentry/inode. - -Signed-off-by: Miklos Szeredi -Fixes: 07a2daab49c5 ("ovl: Copy up underlying inode's ->i_mode to overlay inode") -Cc: ---- - fs/inode.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fs/inode.c b/fs/inode.c -index 4ccbc21..68db390 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1740,8 +1740,8 @@ static int __remove_privs(struct dentry *dentry, int kill) - */ - int file_remove_privs(struct file *file) - { -- struct dentry *dentry = file->f_path.dentry; -- struct inode *inode = d_inode(dentry); -+ struct dentry *dentry = file_dentry(file); -+ struct inode *inode = file_inode(file); - int kill; - int error = 0; - -@@ -1749,7 +1749,7 @@ int file_remove_privs(struct file *file) - if (IS_NOSEC(inode)) - return 0; - -- kill = file_needs_remove_privs(file); -+ kill = dentry_needs_remove_privs(dentry); - if (kill < 0) - return kill; - if (kill) --- -2.4.10 -