Subject: + compat-fix-sys_fanotify_mark.patch added to -mm tree
To: 
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
From: [email protected]
Date: Wed, 15 Jan 2014 12:52:28 -0800


The patch titled
     Subject: compat: fix sys_fanotify_mark
has been added to the -mm tree.  Its filename is
     compat-fix-sys_fanotify_mark.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/compat-fix-sys_fanotify_mark.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/compat-fix-sys_fanotify_mark.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Heiko Carstens <[email protected]>
Subject: compat: fix sys_fanotify_mark

91c2e0bcae72 ("unify compat fanotify_mark(2), switch to
COMPAT_SYSCALL_DEFINE") added a new unified compat fanotify_mark syscall
to be used by all architectures.  Unfortunately the unified version merges
the split mask parameter in a wrong way: the lower and higher word got
swapped.

This was discovered with glibc's tst-fanotify test case.

Signed-off-by: Heiko Carstens <[email protected]>
Reported-by: Andreas Krebbel <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: <[email protected]>    [3.10+]
Signed-off-by: Andrew Morton <[email protected]>
---

 fs/notify/fanotify/fanotify_user.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/notify/fanotify/fanotify_user.c~compat-fix-sys_fanotify_mark 
fs/notify/fanotify/fanotify_user.c
--- a/fs/notify/fanotify/fanotify_user.c~compat-fix-sys_fanotify_mark
+++ a/fs/notify/fanotify/fanotify_user.c
@@ -886,9 +886,9 @@ COMPAT_SYSCALL_DEFINE6(fanotify_mark,
 {
        return sys_fanotify_mark(fanotify_fd, flags,
 #ifdef __BIG_ENDIAN
-                               ((__u64)mask1 << 32) | mask0,
-#else
                                ((__u64)mask0 << 32) | mask1,
+#else
+                               ((__u64)mask1 << 32) | mask0,
 #endif
                                 dfd, pathname);
 }
_

Patches currently in -mm which might be from [email protected] are

linux-next.patch
compat-fix-sys_fanotify_mark.patch

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to