Skip to content

Commit

Permalink
vfs: O_* bit numbers uniqueness check
Browse files Browse the repository at this point in the history
The O_* bit numbers are defined in 20+ arch/*, and can silently overlap.
Add a compile time check to ensure the uniqueness as suggested by David
Miller.

Signed-off-by: Wu Fengguang <[email protected]>
Cc: David Miller <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Eric Paris <[email protected]>
Cc: Roland Dreier <[email protected]>
Cc: Jamie Lokier <[email protected]>
Cc: Andreas Schwab <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Wu Fengguang authored and torvalds committed Aug 11, 2010
1 parent 5893947 commit 454eedb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
15 changes: 13 additions & 2 deletions fs/fcntl.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,11 +767,22 @@ void kill_fasync(struct fasync_struct **fp, int sig, int band)
}
EXPORT_SYMBOL(kill_fasync);

static int __init fasync_init(void)
static int __init fcntl_init(void)
{
/* please add new bits here to ensure allocation uniqueness */
BUILD_BUG_ON(19 - 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
));

fasync_cache = kmem_cache_create("fasync_cache",
sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL);
return 0;
}

module_init(fasync_init)
module_init(fcntl_init)
4 changes: 4 additions & 0 deletions include/asm-generic/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
* -Eric Paris
*/

/*
* When introducing new O_* bits, please check its uniqueness in fcntl_init().
*/

#define O_ACCMODE 00000003
#define O_RDONLY 00000000
#define O_WRONLY 00000001
Expand Down

0 comments on commit 454eedb

Please sign in to comment.