commit 65a5a14ae0dabe6a4108d79250f61f222db95990
Author: Jan Rękorajski <[email protected]>
Date: Tue Jun 24 00:26:03 2014 +0200
- fanotify overflow fix applied upstream
kernel-small_fixes.patch | 42 ------------------------------------------
1 file changed, 42 deletions(-)
---
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index c64eee1..7d12330 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -71,45 +71,3 @@ index 3b1ea34..eaa808e 100644
result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
if (result)
-From 1e2ee49f7f1b79f0b14884fe6a602f0411b39552 Mon Sep 17 00:00:00 2001
-From: Will Woods <[email protected]>
-Date: Tue, 6 May 2014 12:50:10 -0700
-Subject: fanotify: fix -EOVERFLOW with large files on 64-bit
-
-On 64-bit systems, O_LARGEFILE is automatically added to flags inside
-the open() syscall (also openat(), blkdev_open(), etc). Userspace
-therefore defines O_LARGEFILE to be 0 - you can use it, but it's a
-no-op. Everything should be O_LARGEFILE by default.
-
-But: when fanotify does create_fd() it uses dentry_open(), which skips
-all that. And userspace can't set O_LARGEFILE in fanotify_init()
-because it's defined to 0. So if fanotify gets an event regarding a
-large file, the read() will just fail with -EOVERFLOW.
-
-This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit
-systems, using the same test as open()/openat()/etc.
-
-Addresses https://bugzilla.redhat.com/show_bug.cgi?id=696821
-
-Signed-off-by: Will Woods <[email protected]>
-Acked-by: Eric Paris <[email protected]>
-Reviewed-by: Jan Kara <[email protected]>
-Signed-off-by: Andrew Morton <[email protected]>
-Signed-off-by: Linus Torvalds <[email protected]>
-
-diff --git a/fs/notify/fanotify/fanotify_user.c
b/fs/notify/fanotify/fanotify_user.c
-index 4e565c8..732648b 100644
---- a/fs/notify/fanotify/fanotify_user.c
-+++ b/fs/notify/fanotify/fanotify_user.c
-@@ -698,6 +698,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags,
unsigned int, event_f_flags)
- }
- group->overflow_event = &oevent->fse;
-
-+ if (force_o_largefile())
-+ event_f_flags |= O_LARGEFILE;
- group->fanotify_data.f_flags = event_f_flags;
- #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
- spin_lock_init(&group->fanotify_data.access_lock);
---
-cgit v0.10.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/52c5f3093582a20a75c9b2d0f4d103e697992917
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
