mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 16:07:39 +00:00
\n
-----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEq1nRK9aeMoq1VSgcnJ2qBz9kQNkFAmH6gtsACgkQnJ2qBz9k QNkHTggAvFfCBZ11AM3MIQifVrN06q0Aq/xTCR56lbLoqjVbLx+oUAPYk45AgzBJ 9NhYFwPbevLs+c1JrigmTW/i2juZghdfV3CBu6uWvnIDgZbjDwt1RFZ/TMuzG488 Orr12n34J+kaM89BxBPxecFXqGW1bqtIeIUkM6M4OefagVvueRP591GEHRPGk60S nz90LIZN2fsXrDq6K0EC4LVnMF8VWe7lpW8vHORc/O83KasHFGv1xXJ/Z1ovq9ln N17pbjFvECyKwIsvQCuKoxa/iutKqiUSQiVyFyN9IryBE5bMKSuv87EP+dKPcP/O Vmkg2AZRAbL9+M/rhgu4mF0bfhnuJQ== =uGov -----END PGP SIGNATURE----- Merge tag 'fsnotify_for_v5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs Pull fanotify fix from Jan Kara: "Fix stale file descriptor in copy_event_to_user" * tag 'fsnotify_for_v5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fanotify: Fix stale file descriptor in copy_event_to_user()
This commit is contained in:
commit
d5084ffbc5
1 changed files with 3 additions and 3 deletions
|
@ -701,9 +701,6 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
|
|||
if (fanotify_is_perm_event(event->mask))
|
||||
FANOTIFY_PERM(event)->fd = fd;
|
||||
|
||||
if (f)
|
||||
fd_install(fd, f);
|
||||
|
||||
if (info_mode) {
|
||||
ret = copy_info_records_to_user(event, info, info_mode, pidfd,
|
||||
buf, count);
|
||||
|
@ -711,6 +708,9 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
|
|||
goto out_close_fd;
|
||||
}
|
||||
|
||||
if (f)
|
||||
fd_install(fd, f);
|
||||
|
||||
return metadata.event_len;
|
||||
|
||||
out_close_fd:
|
||||
|
|
Loading…
Reference in a new issue