Linux v4.17-11782-gbe779f03d563

This commit is contained in:
Laura Abbott 2018-06-13 10:54:20 -07:00
parent 9e3153d84f
commit 5f1fb0c45a
24 changed files with 28 additions and 42 deletions

View File

@ -1,33 +0,0 @@
From 9c625d3a4eb215369b10b075b2006f9c3035c93f Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Tue, 12 Jun 2018 08:48:18 -0700
Subject: [PATCH] Revert "debugfs: inode: debugfs_create_dir uses mode
permission from parent"
This reverts commit 95cde3c59966f6371b6bcd9e4e2da2ba64ee9775.
A custom revert due to secure boot lockdown conflicts.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
fs/debugfs/inode.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index e392ca19bdd4..4daec17b8215 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -538,9 +538,7 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
if (unlikely(!inode))
return failed_creating(dentry);
- if (!parent)
- parent = debugfs_mount->mnt_root;
- inode->i_mode = S_IFDIR | ((d_inode(parent)->i_mode & 0770));
+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
inode->i_op = &debugfs_dir_inode_operations;
inode->i_fop = &simple_dir_operations;
--
2.17.0

View File

@ -0,0 +1 @@
# CONFIG_DM_WRITECACHE is not set

View File

@ -1737,9 +1737,9 @@ index 13b01351dd1c..4daec17b8215 100644
dentry->d_fsdata = (void *)((unsigned long)real_fops |
DEBUGFS_FSDATA_IS_REAL_FOPS_BIT);
@@ -515,7 +541,7 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
if (!parent)
parent = debugfs_mount->mnt_root;
inode->i_mode = S_IFDIR | ((d_inode(parent)->i_mode & 0770));
return failed_creating(dentry);
inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
- inode->i_op = &simple_dir_inode_operations;
+ inode->i_op = &debugfs_dir_inode_operations;
inode->i_fop = &simple_dir_operations;

2
gitrev
View File

@ -1 +1 @@
8efcf34a263965e471e3999904f94d1f6799d42a
be779f03d563981c65cc7417cc5e0dbbc5b89d30

View File

@ -1356,6 +1356,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1346,6 +1346,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1413,6 +1413,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1357,6 +1357,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1347,6 +1347,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1403,6 +1403,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1181,6 +1181,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1194,6 +1194,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1194,6 +1194,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1181,6 +1181,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1161,6 +1161,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1148,6 +1148,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1116,6 +1116,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1103,6 +1103,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1116,6 +1116,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
# CONFIG_DNET is not set

View File

@ -1103,6 +1103,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
# CONFIG_DNET is not set

View File

@ -1241,6 +1241,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -1228,6 +1228,7 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_UNSTRIPED=m
CONFIG_DM_VERITY_FEC=y
CONFIG_DM_VERITY=m
# CONFIG_DM_WRITECACHE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_ZONED=m
CONFIG_DNET=m

View File

@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
%define gitrev 7
%define gitrev 8
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@ -601,9 +601,6 @@ Patch501: Fix-for-module-sig-verification.patch
# rhbz 1431375
Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
# rhbz 1589855
Patch503: 0001-Revert-debugfs-inode-debugfs_create_dir-uses-mode-pe.patch
# rhbz 1470995
Patch504: kexec-bzimage-verify-pe-signature-fix.patch
@ -1842,6 +1839,9 @@ fi
#
#
%changelog
* Wed Jun 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git8.1
- Linux v4.17-11782-gbe779f03d563
* Wed Jun 13 2018 Jeremy Cline <jeremy@jcline.org>
- Fix kexec_file_load pefile signature verification (rhbz 1470995)

View File

@ -1,2 +1,2 @@
SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
SHA512 (patch-4.17-git7.xz) = 5f191dfe18e0de3433aec757a994d768ce67e2661c15feb06ddf64bbe0074436ddf6c21354b95c7eebd725dc8b5bfe82555212a431a937909d55d2afd122757e
SHA512 (patch-4.17-git8.xz) = 6e8f3ee0536d5c4250b7709a7c67f918721da75f7afbbf205c5af5a33bd350f0ad95e0a30d5a06f852e381dd13a89101344364463ee6c1004c308acdb6cf0329