Commit a0ec1ded authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Linus Torvalds

orangefs: initialize op on loop restart in orangefs_devreq_read

In orangefs_devreq_read, there is a loop which picks an op off the list
of pending ops.  If the loop fails to find an op, there is nothing to
read, and it returns EAGAIN.  If the op has been given up on, the loop
is restarted via a goto.  The bug is that the variable which the found
op is written to is not reinitialized, so if there are no more eligible
ops on the list, the code runs again on the already handled op.

This is triggered by interrupting a process while the op is being copied
to the client-core.  It's a fairly small window, but it's there.
Signed-off-by: default avatarMartin Brandenburg <>
Signed-off-by: default avatarLinus Torvalds <>
parent 0afc0dec
......@@ -162,7 +162,7 @@ static ssize_t orangefs_devreq_read(struct file *file,
struct orangefs_kernel_op_s *op, *temp;
static __s32 magic = ORANGEFS_DEVREQ_MAGIC;
struct orangefs_kernel_op_s *cur_op = NULL;
struct orangefs_kernel_op_s *cur_op;
unsigned long ret;
/* We do not support blocking IO. */
......@@ -186,6 +186,7 @@ static ssize_t orangefs_devreq_read(struct file *file,
return -EAGAIN;
cur_op = NULL;
/* Get next op (if any) from top of list. */
list_for_each_entry_safe(op, temp, &orangefs_request_list, list) {
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