mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
fsnotify: preserve 64-bit pre-content ranges
vfs_fallocate() and remap_verify_area() pass 64-bit lengths to
fsnotify_file_area_perm(), which truncates them to size_t on
32-bit systems.
Use 64 bit (unsigned) types throughout the entire pre-content
notification chain to keep the full range. The userspace range
field is already 64-bits.
Fixes: 9740d17162 ("fsnotify: pass optional file access range in pre-content event")
Signed-off-by: Avi Weiss <thnkslprpt@gmail.com>
Link: https://patch.msgid.link/20261015175701.3674449-1-thnkslprpt@gmail.com
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
6b4b543fa1
commit
1dcf2be94b
|
|
@ -444,7 +444,7 @@ struct fanotify_perm_event {
|
|||
struct fanotify_event fae;
|
||||
struct path path;
|
||||
loff_t pos; /* FANOTIFY_NO_RANGE if unavailable */
|
||||
size_t count;
|
||||
u64 count;
|
||||
u32 response; /* userspace answer to the event */
|
||||
unsigned short state; /* state of the event */
|
||||
unsigned short watchdog_cnt; /* already scanned by watchdog? */
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ static inline __u32 fsnotify_object_watched(struct inode *inode, __u32 mnt_mask,
|
|||
|
||||
/* Report pre-content event with optional range info */
|
||||
int fsnotify_pre_content(const struct path *path, const loff_t *ppos,
|
||||
size_t count)
|
||||
u64 count)
|
||||
{
|
||||
struct file_range range;
|
||||
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ int fsnotify_open_perm_and_set_mode(struct file *file);
|
|||
* fsnotify_file_area_perm - permission hook before access to file range
|
||||
*/
|
||||
static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,
|
||||
const loff_t *ppos, size_t count)
|
||||
const loff_t *ppos, u64 count)
|
||||
{
|
||||
/*
|
||||
* filesystem may be modified in the context of permission events
|
||||
|
|
@ -213,7 +213,7 @@ static inline int fsnotify_open_perm_and_set_mode(struct file *file)
|
|||
}
|
||||
|
||||
static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,
|
||||
const loff_t *ppos, size_t count)
|
||||
const loff_t *ppos, u64 count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ struct fs_error_report {
|
|||
struct file_range {
|
||||
const struct path *path;
|
||||
loff_t pos;
|
||||
size_t count;
|
||||
u64 count;
|
||||
};
|
||||
|
||||
static inline const struct path *file_range_path(const struct file_range *range)
|
||||
|
|
@ -946,12 +946,12 @@ static inline void fsnotify_init_event(struct fsnotify_event *event)
|
|||
INIT_LIST_HEAD(&event->list);
|
||||
}
|
||||
int fsnotify_pre_content(const struct path *path, const loff_t *ppos,
|
||||
size_t count);
|
||||
u64 count);
|
||||
|
||||
#else
|
||||
|
||||
static inline int fsnotify_pre_content(const struct path *path,
|
||||
const loff_t *ppos, size_t count)
|
||||
const loff_t *ppos, u64 count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user