summaryrefslogtreecommitdiffstats
path: root/source/k/linux-4.4.14.ecryptfs.regression.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/k/linux-4.4.14.ecryptfs.regression.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/k/linux-4.4.14.ecryptfs.regression.diff')
-rw-r--r--source/k/linux-4.4.14.ecryptfs.regression.diff37
1 files changed, 0 insertions, 37 deletions
diff --git a/source/k/linux-4.4.14.ecryptfs.regression.diff b/source/k/linux-4.4.14.ecryptfs.regression.diff
deleted file mode 100644
index 946ddda49..000000000
--- a/source/k/linux-4.4.14.ecryptfs.regression.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Tyler Hicks <tyhicks <at> canonical.com>
-Subject: [PATCH] eCryptfs: Fix directory open regression in linux-stable
-Newsgroups: gmane.comp.file-systems.ecryptfs.general, gmane.linux.kernel.stable
-Date: 2016-06-29 03:39:41 GMT (18 hours and 6 minutes ago)
-
-Cherry-picking mainline commit 2f36db71009304b3f0b95afacd8eba1f9f046b87
-introduces a regression in eCryptfs when mainline commit
-6a480a7842545ec520a91730209ec0bae41694c1 (4.6+) is not present. The
-regression causes all attempts at opening directory files to fail with
-EMEDIUMTYPE when the lower filesystem's file_operations for directory
-files do not implement mmap.
-
-This is a simple fix that allows the check for the lower file's mmap
-implementation to be ignored if the lower file is a directory.
-
-Signed-off-by: Tyler Hicks <tyhicks <at> canonical.com>
-Tested-by: Tyler Hicks <tyhicks <at> canonical.com> # 4.4.y, 3.18.y
-Cc: <stable <at> vger.kernel.org> # 4.5-
----
- fs/ecryptfs/kthread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
-index e818f5a..b9faeab 100644
---- a/fs/ecryptfs/kthread.c
-+++ b/fs/ecryptfs/kthread.c
- <at> <at> -171,7 +171,7 <at> <at> int ecryptfs_privileged_open(struct file **lower_file,
- goto out;
- }
- have_file:
-- if ((*lower_file)->f_op->mmap == NULL) {
-+ if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) {
- fput(*lower_file);
- *lower_file = NULL;
- rc = -EMEDIUMTYPE;
---
-2.7.4