Skip to content

driver/linux_onload: fix RCU usage #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ol-alexandra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

driver/linux_onload: fix RCU usage #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/driver/linux_onload/ossock_calls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ oo_fd_replace_file(struct file* old_filp, struct file* new_filp,
{
struct file* tmp_filp = NULL;

rcu_read_lock();
task_lock(current);
if( atomic_read(&current->files->count) != 1 ) {
/* This is a multithreaded application, and someone can be already
Expand All @@ -96,7 +97,6 @@ oo_fd_replace_file(struct file* old_filp, struct file* new_filp,
unsigned flags;

task_unlock(current);
rcu_read_lock(); /* for files_fdtable() */
flags = efrm_close_on_exec(old_fd, current->files) ? O_CLOEXEC : 0;
rcu_read_unlock();
new_fd = get_unused_fd_flags(flags);
Expand All @@ -117,6 +117,7 @@ oo_fd_replace_file(struct file* old_filp, struct file* new_filp,
if( tmp_filp )
fput(tmp_filp);
task_unlock(current);
rcu_read_unlock();
return -EINVAL;
}

Expand All @@ -125,6 +126,7 @@ oo_fd_replace_file(struct file* old_filp, struct file* new_filp,
get_file(new_filp);
rcu_assign_pointer(files_fdtable(current->files)->fd[old_fd], new_filp);
task_unlock(current);
rcu_read_unlock();

/* No synchronize_rcu() is needed here. See do_dup2() for an example,
* and file_free() for the reason. */
Expand Down