diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
| download | nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch | 20 |
1 files changed, 20 insertions, 0 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 new file mode 100644 index 00000000000..7f94669a9f4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch @@ -0,0 +1,20 @@ +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; |