* [PATCHv2 0/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
@ 2014-11-24 11:23 David Drysdale
2014-11-24 11:23 ` [PATCHv2 1/1] " David Drysdale
0 siblings, 1 reply; 6+ messages in thread
From: David Drysdale @ 2014-11-24 11:23 UTC (permalink / raw)
To: Alexander Viro, Eric Paris, David Miller, Heinrich Schuchardt
Cc: Arnd Bergmann, Jan Kara, linux-fsdevel, linux-kernel, sparclinux,
David Drysdale
Changes since v1:
- reword commit to indicate origin of clash [Heinrich Schuchardt]
- remove comment fix [Heinrich Schuchardt]
- acked-by [David S. Miller]
Against v3.18-rc5.
Tested by running fatrace on x86_64, and by cross-compiling against
sparc, arm, arm64, m68k, mips, powerpc, alpha, parisc, blackfin.
David Drysdale (1):
vfs: renumber FMODE_NONOTIFY and add to uniqueness check
fs/fcntl.c | 5 +++--
include/linux/fs.h | 2 +-
include/uapi/asm-generic/fcntl.h | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
--
2.1.0.rc2.206.gedb03e5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
2014-11-24 11:23 [PATCHv2 0/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check David Drysdale
@ 2014-11-24 11:23 ` David Drysdale
2014-11-24 11:30 ` Jan Kara
2015-01-07 0:29 ` Andrew Morton
0 siblings, 2 replies; 6+ messages in thread
From: David Drysdale @ 2014-11-24 11:23 UTC (permalink / raw)
To: Alexander Viro, Eric Paris, David Miller, Heinrich Schuchardt
Cc: Arnd Bergmann, Jan Kara, linux-fsdevel, linux-kernel, sparclinux,
David Drysdale
Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.
The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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: David Drysdale <drysdale@google.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
fs/fcntl.c | 5 +++--
include/linux/fs.h | 2 +-
include/uapi/asm-generic/fcntl.h | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 99d440a4a6ba..ee85cd4e136a 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -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",
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9ab779e8a63c..fc1c2488adbc 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -134,7 +134,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
diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index 7543b3e51331..e063effe0cc1 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -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
--
2.1.0.rc2.206.gedb03e5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
2014-11-24 11:23 ` [PATCHv2 1/1] " David Drysdale
@ 2014-11-24 11:30 ` Jan Kara
2014-12-25 14:47 ` Heinrich Schuchardt
2015-01-07 0:29 ` Andrew Morton
1 sibling, 1 reply; 6+ messages in thread
From: Jan Kara @ 2014-11-24 11:30 UTC (permalink / raw)
To: David Drysdale
Cc: Alexander Viro, Eric Paris, David Miller, Heinrich Schuchardt,
Arnd Bergmann, Jan Kara, linux-fsdevel, linux-kernel, sparclinux
On Mon 24-11-14 11:23:19, David Drysdale wrote:
> Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.
> The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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: David Drysdale <drysdale@google.com>
> Acked-by: David S. Miller <davem@davemloft.net>
Looks good. You can add:
Acked-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/fcntl.c | 5 +++--
> include/linux/fs.h | 2 +-
> include/uapi/asm-generic/fcntl.h | 2 +-
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/fcntl.c b/fs/fcntl.c
> index 99d440a4a6ba..ee85cd4e136a 100644
> --- a/fs/fcntl.c
> +++ b/fs/fcntl.c
> @@ -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",
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 9ab779e8a63c..fc1c2488adbc 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -134,7 +134,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
> diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
> index 7543b3e51331..e063effe0cc1 100644
> --- a/include/uapi/asm-generic/fcntl.h
> +++ b/include/uapi/asm-generic/fcntl.h
> @@ -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
> --
> 2.1.0.rc2.206.gedb03e5
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
2014-11-24 11:30 ` Jan Kara
@ 2014-12-25 14:47 ` Heinrich Schuchardt
0 siblings, 0 replies; 6+ messages in thread
From: Heinrich Schuchardt @ 2014-12-25 14:47 UTC (permalink / raw)
Cc: Jan Kara, David Drysdale, Alexander Viro, Eric Paris,
David Miller, Arnd Bergmann, linux-fsdevel, linux-kernel,
sparclinux, Andrew Morton
Hello Andrew,
could you, please, consider the patch proposed in
https://lkml.org/lkml/2014/11/24/196
for inclusion into the mm-tree.
This 2nd version of the patch considers the review comments in the
thread starting at https://lkml.org/lkml/2014/11/21/141.
Best regards
Heinrich Schuchardt
On 24.11.2014 12:30, Jan Kara wrote:
> On Mon 24-11-14 11:23:19, David Drysdale wrote:
>> Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.
>> The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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: David Drysdale <drysdale@google.com>
>> Acked-by: David S. Miller <davem@davemloft.net>
> Looks good. You can add:
> Acked-by: Jan Kara <jack@suse.cz>
>
> Honza
>
>> ---
>> fs/fcntl.c | 5 +++--
>> include/linux/fs.h | 2 +-
>> include/uapi/asm-generic/fcntl.h | 2 +-
>> 3 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/fcntl.c b/fs/fcntl.c
>> index 99d440a4a6ba..ee85cd4e136a 100644
>> --- a/fs/fcntl.c
>> +++ b/fs/fcntl.c
>> @@ -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",
>> diff --git a/include/linux/fs.h b/include/linux/fs.h
>> index 9ab779e8a63c..fc1c2488adbc 100644
>> --- a/include/linux/fs.h
>> +++ b/include/linux/fs.h
>> @@ -134,7 +134,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
>> diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
>> index 7543b3e51331..e063effe0cc1 100644
>> --- a/include/uapi/asm-generic/fcntl.h
>> +++ b/include/uapi/asm-generic/fcntl.h
>> @@ -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
>> --
>> 2.1.0.rc2.206.gedb03e5
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
2014-11-24 11:23 ` [PATCHv2 1/1] " David Drysdale
2014-11-24 11:30 ` Jan Kara
@ 2015-01-07 0:29 ` Andrew Morton
2015-01-08 9:06 ` David Drysdale
1 sibling, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2015-01-07 0:29 UTC (permalink / raw)
To: David Drysdale
Cc: Alexander Viro, Eric Paris, David Miller, Heinrich Schuchardt,
Arnd Bergmann, Jan Kara, linux-fsdevel, linux-kernel, sparclinux
On Mon, 24 Nov 2014 11:23:19 +0000 David Drysdale <drysdale@google.com> wrote:
> Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.
> The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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.
What are the user-visible runtime effects of the bug?
Please always include this info when fixing bugs, so people can work
out which kernel version(s) need the fix.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check
2015-01-07 0:29 ` Andrew Morton
@ 2015-01-08 9:06 ` David Drysdale
0 siblings, 0 replies; 6+ messages in thread
From: David Drysdale @ 2015-01-08 9:06 UTC (permalink / raw)
To: Andrew Morton, Eric Paris, David Miller
Cc: Alexander Viro, Heinrich Schuchardt, Arnd Bergmann, Jan Kara,
linux-fsdevel, linux-kernel@vger.kernel.org, sparclinux
On Wed, Jan 7, 2015 at 12:29 AM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> On Mon, 24 Nov 2014 11:23:19 +0000 David Drysdale <drysdale@google.com> wrote:
>
>> Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc.
>> The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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.
>
> What are the user-visible runtime effects of the bug?
>
> Please always include this info when fixing bugs, so people can work
> out which kernel version(s) need the fix.
I don't know for sure what the user-visible effects are -- I noticed
the problem from the source and I don't have a sparc system (the only
affected architecture) to test with. But I'd guess that...
The likely user-visible effect (on sparc) of the clash would be that:
- Filesystem activity on files opened with O_PATH does not get
reported via the fanotify(7) API.
- The file descriptors for accessed objects reported via the
fanotify(7) API will effectively have O_PATH set, and so will
have the limitations described for O_PATH in the open(2) manpage.
However, we'd need some intersection of sparc/fanotify folk to verify
those guesses -- Eric / David, any thoughts?
Thanks,
David
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-08 9:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-24 11:23 [PATCHv2 0/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check David Drysdale
2014-11-24 11:23 ` [PATCHv2 1/1] " David Drysdale
2014-11-24 11:30 ` Jan Kara
2014-12-25 14:47 ` Heinrich Schuchardt
2015-01-07 0:29 ` Andrew Morton
2015-01-08 9:06 ` David Drysdale
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).