diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 15:45:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 15:45:49 -0800 |
| commit | a3383e8372c0c11238f9bb9777929bfc3a2d320a (patch) | |
| tree | 1eb117842e70b17e8b7e96a955cd0ef6f0f40732 /fs/namei.c | |
| parent | 68a4ec9c03461e94a9577cf499069621bb074833 (diff) | |
| parent | 7d13162332f2b67a941d18cee20f1c0413e020de (diff) | |
| download | linux-stable-a3383e8372c0c11238f9bb9777929bfc3a2d320a.tar.gz linux-stable-a3383e8372c0c11238f9bb9777929bfc3a2d320a.tar.bz2 linux-stable-a3383e8372c0c11238f9bb9777929bfc3a2d320a.zip | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify:
fanotify: fill in the metadata_len field on struct fanotify_event_metadata
fanotify: split version into version and metadata_len
fanotify: Dont try to open a file descriptor for the overflow event
fanotify: Introduce FAN_NOFD
fanotify: do not leak user reference on allocation failure
inotify: stop kernel memory leak on file creation failure
fanotify: on group destroy allow all waiters to bypass permission check
fanotify: Dont allow a mask of 0 if setting or removing a mark
fanotify: correct broken ref counting in case adding a mark failed
fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
fanotify: remove packed from access response message
fanotify: deny permissions when no event was sent
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5362af9b7372..4ff7ca530533 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1748,6 +1748,9 @@ struct file *do_filp_open(int dfd, const char *pathname, if (!(open_flag & O_CREAT)) mode = 0; + /* Must never be set by userspace */ + open_flag &= ~FMODE_NONOTIFY; + /* * O_SYNC is implemented as __O_SYNC|O_DSYNC. As many places only * check for O_DSYNC if the need any syncing at all we enforce it's |