Skip to content

Commit

Permalink
9p-trans_fd: don't do fs segment mangling in p9_fd_poll()
Browse files Browse the repository at this point in the history
p9_fd_poll() is never called with user pointers and f_op->poll()
doesn't expect its arguments to be from userland.  There's no need to
set kernel ds before calling f_op->poll() from p9_fd_poll().  Remove
it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  • Loading branch information
Tejun Heo authored and Eric Van Hensbergen committed Sep 24, 2008
1 parent 571ffea commit ec3c68f
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions net/9p/trans_fd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,6 @@ p9_fd_poll(struct p9_trans *trans, struct poll_table_struct *pt)
{
int ret, n;
struct p9_trans_fd *ts = NULL;
mm_segment_t oldfs;

if (trans && trans->status == Connected)
ts = trans->priv;
Expand All @@ -1358,24 +1357,17 @@ p9_fd_poll(struct p9_trans *trans, struct poll_table_struct *pt)
if (!ts->wr->f_op || !ts->wr->f_op->poll)
return -EIO;

oldfs = get_fs();
set_fs(get_ds());

ret = ts->rd->f_op->poll(ts->rd, pt);
if (ret < 0)
goto end;
return ret;

if (ts->rd != ts->wr) {
n = ts->wr->f_op->poll(ts->wr, pt);
if (n < 0) {
ret = n;
goto end;
}
if (n < 0)
return n;
ret = (ret & ~POLLOUT) | (n & ~POLLIN);
}

end:
set_fs(oldfs);
return ret;
}

Expand Down

0 comments on commit ec3c68f

Please sign in to comment.