mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 13:08:39 +03:00
Revert "ecryptfs: fix kernel bug introduced in 4.4.14"
The Linux 4.4.17 release fixes the underlying issue
This reverts commit fad9a8841b
.
This commit is contained in:
parent
b839d0cd75
commit
18947c9e36
@ -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;
|
|
@ -148,8 +148,4 @@ rec {
|
|||||||
sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy";
|
sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
ecryptfs_fix_mmap_bug =
|
|
||||||
{ name = "ecryptfs_fix_mmap_bug";
|
|
||||||
patch = ./ecryptfs-fix-mmap-bug.patch;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -11130,7 +11130,6 @@ in
|
|||||||
linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
|
linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[ kernelPatches.bridge_stp_helper
|
[ kernelPatches.bridge_stp_helper
|
||||||
kernelPatches.ecryptfs_fix_mmap_bug
|
|
||||||
]
|
]
|
||||||
++ lib.optionals ((platform.kernelArch or null) == "mips")
|
++ lib.optionals ((platform.kernelArch or null) == "mips")
|
||||||
[ kernelPatches.mips_fpureg_emu
|
[ kernelPatches.mips_fpureg_emu
|
||||||
|
Loading…
Reference in New Issue
Block a user