diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-11 17:15:04 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-11 17:15:54 +0100 |
| commit | 18947c9e36a1b869183e2027f2061a07584e42dd (patch) | |
| tree | df78102d347af31412d1ad83f63b3c930128906c /pkgs | |
| parent | b839d0cd758b0178849a59700c0a1a17c8a62d65 (diff) | |
| download | nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar.gz nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar.bz2 nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar.lz nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar.xz nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.tar.zst nixlib-18947c9e36a1b869183e2027f2061a07584e42dd.zip | |
Revert "ecryptfs: fix kernel bug introduced in 4.4.14"
The Linux 4.4.17 release fixes the underlying issue This reverts commit fad9a8841b67ee9e09dd352785e24d9b9d22e11c.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch b/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch deleted file mode 100644 index 7f94669a9f45..000000000000 --- a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch +++ /dev/null @@ -1,20 +0,0 @@ -Signed-off-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> -Tested-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> # 4.4.y, 3.18.y -Cc: <stable@xxxxxxxxxxxxxxx> # 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 -@@ -171,7 +171,7 @@ 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; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 375f0e3b0b42..56963d89efaa 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -148,8 +148,4 @@ rec { sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy"; }; }; - ecryptfs_fix_mmap_bug = - { name = "ecryptfs_fix_mmap_bug"; - patch = ./ecryptfs-fix-mmap-bug.patch; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b03912c3b11..0f881093efb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11130,7 +11130,6 @@ in linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.ecryptfs_fix_mmap_bug ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu |