Skip to content

Commit 113385c

Browse files
committed
Merge tag 'fsnotify_for_v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull inotify update from Jan Kara: "A small inotify strcpy() cleanup" * tag 'fsnotify_for_v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: inotify: Use strscpy() for event->name copies
2 parents b477ff9 + b8f2688 commit 113385c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/notify/inotify/inotify_fsnotify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,
121121
event->sync_cookie = cookie;
122122
event->name_len = len;
123123
if (len)
124-
strcpy(event->name, name->name);
124+
strscpy(event->name, name->name, event->name_len + 1);
125125

126126
ret = fsnotify_add_event(group, fsn_event, inotify_merge);
127127
if (ret) {

0 commit comments

Comments
 (0)