Commit 8aa37bde authored by Al Viro's avatar Al Viro

protect the fetch of ->fd[fd] in do_dup2() from mispredictions

both callers have verified that fd is not greater than ->max_fds;
however, misprediction might end up with
        tofree = fdt->fd[fd];
being speculatively executed.  That's wrong for the same reasons
why it's wrong in close_fd()/file_close_fd_locked(); the same
solution applies - array_index_nospec(fd, fdt->max_fds) could differ
from fd only in case of speculative execution on mispredicted path.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8400291e
...@@ -1248,6 +1248,7 @@ __releases(&files->file_lock) ...@@ -1248,6 +1248,7 @@ __releases(&files->file_lock)
* tables and this condition does not arise without those. * tables and this condition does not arise without those.
*/ */
fdt = files_fdtable(files); fdt = files_fdtable(files);
fd = array_index_nospec(fd, fdt->max_fds);
tofree = fdt->fd[fd]; tofree = fdt->fd[fd];
if (!tofree && fd_is_open(fd, fdt)) if (!tofree && fd_is_open(fd, fdt))
goto Ebusy; goto Ebusy;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment