Commit 113385c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b477ff98 b8f26882

fs/notify/inotify/inotify_fsnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask, 
	event->sync_cookie = cookie;

	event->name_len = len;

	if (len)

		strcpy(event->name, name->name);

		strscpy(event->name, name->name, event->name_len + 1);



	ret = fsnotify_add_event(group, fsn_event, inotify_merge);

	if (ret) {