Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75069f2b authored by David Drysdale's avatar David Drysdale Committed by Linus Torvalds
Browse files

vfs: renumber FMODE_NONOTIFY and add to uniqueness check 



Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.  The
clashing O_PATH value was added in commit 5229645b ("vfs: add
nonconflicting values for O_PATH") but this can't be changed as it is
user-visible.

FMODE_NONOTIFY is only used internally in the kernel, but it is in the
same numbering space as the other O_* flags, as indicated by the comment
at the top of include/uapi/asm-generic/fcntl.h (and its use in
fs/notify/fanotify/fanotify_user.c).  So renumber it to avoid the clash.

All of this has happened before (commit 12ed2e36: "fanotify:
FMODE_NONOTIFY and __O_SYNC in sparc conflict"), and all of this will
happen again -- so update the uniqueness check in fcntl_init() to
include __FMODE_NONOTIFY.

Signed-off-by: default avatarDavid Drysdale <drysdale@google.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarJan Kara <jack@suse.cz>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9de93e78

fs/fcntl.c

+3 −2
Original line number Diff line number Diff line
@@ -740,14 +740,15 @@ static int __init fcntl_init(void) 
	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY

	 * is defined as O_NONBLOCK on some platforms and not on others.

	 */

	BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(

	BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(

		O_RDONLY	| O_WRONLY	| O_RDWR	|

		O_CREAT		| O_EXCL	| O_NOCTTY	|

		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */

		__O_SYNC	| O_DSYNC	| FASYNC	|

		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|

		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|

		__FMODE_EXEC	| O_PATH	| __O_TMPFILE

		__FMODE_EXEC	| O_PATH	| __O_TMPFILE	|

		__FMODE_NONOTIFY

		));



	fasync_cache = kmem_cache_create("fasync_cache",

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset, 
#define FMODE_CAN_WRITE         ((__force fmode_t)0x40000)



/* File was opened by fanotify and shouldn't generate fanotify events */

#define FMODE_NONOTIFY		((__force fmode_t)0x1000000)

#define FMODE_NONOTIFY		((__force fmode_t)0x4000000)



/*

 * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector

include/uapi/asm-generic/fcntl.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


/*

 * FMODE_EXEC is 0x20

 * FMODE_NONOTIFY is 0x1000000

 * FMODE_NONOTIFY is 0x4000000

 * These cannot be used by userspace O_* until internal and external open

 * flags are split.

 * -Eric Paris