mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-25 00:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2138 from mischief/linux-4.7.1

Browse Source 
Linux 4.7.1 + 9P fix
This commit is contained in:
Nick Owens 2016-08-18 14:30:23 -07:00 committed by GitHub
commit 31011a57cf
6 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.0-r5.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.7.1.ebuild vendored
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=5 EAPI=5
COREOS_SOURCE_REVISION="-r1" COREOS_SOURCE_REVISION=""
inherit coreos-kernel inherit coreos-kernel
DESCRIPTION="CoreOS Linux kernel" DESCRIPTION="CoreOS Linux kernel"

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.0-r5.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.7.1.ebuild vendored
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=5 EAPI=5
COREOS_SOURCE_REVISION="-r1" COREOS_SOURCE_REVISION=""
inherit coreos-kernel savedconfig inherit coreos-kernel savedconfig
DESCRIPTION="CoreOS Linux kernel modules" DESCRIPTION="CoreOS Linux kernel modules"

6
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.7 vendored
View File

@ -769,10 +769,14 @@ CONFIG_CIFS_ACL=y
CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_FSCACHE=y
CONFIG_NET_9p=m CONFIG_NET_9P=m
CONFIG_NET_9P_VIRTIO=m
CONFIG_NET_9P_RDMA=m
# CONFIG_NET_9P_DEBUG is not set
CONFIG_9P_FS=m CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y CONFIG_9P_FS_POSIX_ACL=y
CONFIG_9P_FS_SECURITY=y
CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_ASCII=m CONFIG_NLS_ASCII=m
CONFIG_NLS_UTF8=m CONFIG_NLS_UTF8=m

1
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest vendored
View File

@ -1 +1,2 @@
DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98 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

1
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.7.1.ebuild vendored
View File

@ -42,5 +42,4 @@ UNIPATCH_LIST="
${PATCH_DIR}/z0018-SELinux-Check-against-union-label-for-file-operation.patch \ ${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}/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}/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 \
" "

47
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 vendored
View File

@ -1,47 +0,0 @@
From bfae341a7c75db3a82912217236924d4cbb87448 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@redhat.com>
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 <mszeredi@redhat.com>
Fixes: 07a2daab49c5 ("ovl: Copy up underlying inode's ->i_mode to overlay inode")
Cc: <stable@vger.kernel.org>
---
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