From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Nov 2017 22:13:11 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: android-x86-8.1-r1~2281
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f14fc0ccee5521e5b38cdd1df4385d32c6e1805b;p=android-x86%2Fkernel.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull quota, ext2, isofs and udf fixes from Jan Kara:

 - two small quota error handling fixes

 - two isofs fixes for architectures with signed char

 - several udf block number overflow and signedness fixes

 - ext2 rework of mount option handling to avoid GFP_KERNEL allocation
   with spinlock held

 - ... it also contains a patch to implement auditing of responses to
   fanotify permission events. That should have been in the fanotify
   pull request but I mistakenly merged that patch into a wrong branch
   and noticed only now at which point I don't think it's worth rebasing
   and redoing.

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: be aware of error from dquot_initialize
  quota: fix potential infinite loop
  isofs: use unsigned char types consistently
  isofs: fix timestamps beyond 2027
  udf: Fix some sign-conversion warnings
  udf: Fix signed/unsigned format specifiers
  udf: Fix 64-bit sign extension issues affecting blocks > 0x7FFFFFFF
  udf: Remove some outdate references from documentation
  udf: Avoid overflow when session starts at large offset
  ext2: Fix possible sleep in atomic during mount option parsing
  ext2: Parse mount options into a dedicated structure
  audit: Record fanotify access control decisions
---

f14fc0ccee5521e5b38cdd1df4385d32c6e1805b
diff --cc fs/notify/fanotify/fanotify.c
index 54cf2d21b547,1968d21a3f37..6702a6a0bbb5
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@@ -62,10 -65,21 +63,10 @@@ static int fanotify_get_response(struc
  
  	pr_debug("%s: group=%p event=%p\n", __func__, group, event);
  
 -	/*
 -	 * fsnotify_prepare_user_wait() fails if we race with mark deletion.
 -	 * Just let the operation pass in that case.
 -	 */
 -	if (!fsnotify_prepare_user_wait(iter_info)) {
 -		event->response = FAN_ALLOW;
 -		goto out;
 -	}
 -
  	wait_event(group->fanotify_data.access_waitq, event->response);
  
 -	fsnotify_finish_user_wait(iter_info);
 -out:
  	/* userspace responded, convert to something usable */
- 	switch (event->response) {
+ 	switch (event->response & ~FAN_AUDIT) {
  	case FAN_ALLOW:
  		ret = 0;
  		break;