Commit 39519f6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes_for_v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull quota and fanotify fixes from Jan Kara:
 "A fixup finishing disabling of quotactl_path() syscall (I've missed
  archs using different way to declare syscalls) and a fix of an fd leak
  in error handling path of fanotify"

* tag 'fixes_for_v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: finish disable quotactl_path syscall
  fanotify: fix copy_event_to_user() fid error clean up
parents 70585216 8b1462b6

fs/notify/fanotify/fanotify_user.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
					info_type, fanotify_info_name(info),

					info->name_len, buf, count);

		if (ret < 0)

			return ret;

			goto out_close_fd;



		buf += ret;

		count -= ret;
@@ -519,7 +519,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
					fanotify_event_object_fh(event),

					info_type, dot, dot_len, buf, count);

		if (ret < 0)

			return ret;

			goto out_close_fd;



		buf += ret;

		count -= ret;

include/uapi/asm-generic/unistd.h

+1 −2
Original line number Diff line number Diff line
@@ -863,8 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) 
__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)

#define __NR_mount_setattr 442

__SYSCALL(__NR_mount_setattr, sys_mount_setattr)

#define __NR_quotactl_path 443

__SYSCALL(__NR_quotactl_path, sys_quotactl_path)

/* 443 is reserved for quotactl_path */



#define __NR_landlock_create_ruleset 444

__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)