From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 4/6] vfs: O_* bit numbers uniqueness check Date: Thu, 11 Mar 2010 14:11:21 -0800 Message-ID: <201003112211.o2BMBLfm013822@imap1.linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Cc: linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org, fengguang.wu@intel.com, davem@davemloft.net, eparis@redhat.com, hch@infradead.org, jamie@shareable.org, rdreier@cisco.com, schwab@linux-m68k.org, sfr@canb.auug.org.au To: viro@zeniv.linux.org.uk Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:59225 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758501Ab0CKWMK (ORCPT ); Thu, 11 Mar 2010 17:12:10 -0500 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Wu Fengguang 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 Cc: David Miller Cc: Stephen Rothwell Cc: Al Viro Cc: Christoph Hellwig Cc: Eric Paris Cc: Roland Dreier Cc: Jamie Lokier Cc: Andreas Schwab Signed-off-by: Andrew Morton --- fs/fcntl.c | 14 ++++++++++++-- include/asm-generic/fcntl.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff -puN fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check fs/fcntl.c --- a/fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check +++ a/fs/fcntl.c @@ -739,11 +739,21 @@ void kill_fasync(struct fasync_struct ** } 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(17 != 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 + )); + 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) diff -puN include/asm-generic/fcntl.h~vfs-o_-bit-numbers-uniqueness-check include/asm-generic/fcntl.h --- a/include/asm-generic/fcntl.h~vfs-o_-bit-numbers-uniqueness-check +++ a/include/asm-generic/fcntl.h @@ -4,6 +4,8 @@ #include /* + * When introducing new O_* bits, please check its uniqueness in fcntl_init(). + * * FMODE_EXEC is 0x20 * FMODE_NONOTIFY is 0x1000000 * These cannot be used by userspace O_* until internal and external open _