From 002bd7b5dbaa30c91b38a4a16f3d76fe299af8c7 Mon Sep 17 00:00:00 2001
From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Mon, 22 Nov 2010 18:46:33 +0100
Subject: [PATCH] --- yaml --- r: 223358 b: refs/heads/master c:
 1734dee4e3a296cb72b4819fc2e7ef2440737dff h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/fs/notify/fanotify/fanotify_user.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ade63697e7f8..e58fac21cf34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa218ab98c31eeacd12b89501e6b99d146ea56cc
+refs/heads/master: 1734dee4e3a296cb72b4819fc2e7ef2440737dff
diff --git a/trunk/fs/notify/fanotify/fanotify_user.c b/trunk/fs/notify/fanotify/fanotify_user.c
index c0ca1fa1550c..480434c5ee5f 100644
--- a/trunk/fs/notify/fanotify/fanotify_user.c
+++ b/trunk/fs/notify/fanotify/fanotify_user.c
@@ -769,8 +769,10 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
 	if (flags & ~FAN_ALL_MARK_FLAGS)
 		return -EINVAL;
 	switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_FLUSH)) {
-	case FAN_MARK_ADD:
+	case FAN_MARK_ADD:		/* fallthrough */
 	case FAN_MARK_REMOVE:
+		if (!mask)
+			return -EINVAL;
 	case FAN_MARK_FLUSH:
 		break;
 	default: