fanotify: Fix stale file descriptor in copy_event_to_user()
commitee12595147
upstream. This code calls fd_install() which gives the userspace access to the fd. Then if copy_info_records_to_user() fails it calls put_unused_fd(fd) but that will not release it and leads to a stale entry in the file descriptor table. Generally you can't trust the fd after a call to fd_install(). The fix is to delay the fd_install() until everything else has succeeded. Fortunately it requires CAP_SYS_ADMIN to reach this code so the security impact is less. Fixes:f644bc449b
("fanotify: fix copy_event_to_user() fid error clean up") Link: https://lore.kernel.org/r/20220128195656.GA26981@kili Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Mathias Krause <minipli@grsecurity.net> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
db6fd92316
Коммит
60765e43e4
|
@ -611,9 +611,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);
|
||||
|
@ -621,6 +618,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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче