Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 60807
b: refs/heads/master
c: 1725d71
h: refs/heads/master
i:
  60805: 4ab2206
  60803: 56730a4
  60799: e2988f4
v: v3
  • Loading branch information
Vasily Averin authored and Linus Torvalds committed Jul 17, 2007
1 parent 6ab5df4 commit 28191a4
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2bf68a3699601bd3e53b4efce7f2d780e243aa35
refs/heads/master: 1725d71d992f5947bdd5b4f9a30fe8a05571fe66
62 changes: 38 additions & 24 deletions trunk/drivers/message/i2o/i2o_config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,6 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
return -ENXIO;
}

msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);

sb = c->status_block.virt;

if (get_user(size, &user_msg[0])) {
Expand All @@ -573,24 +571,30 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,

size <<= 2; // Convert to bytes

msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
if (IS_ERR(msg))
return PTR_ERR(msg);

rcode = -EFAULT;
/* Copy in the user's I2O command */
if (copy_from_user(msg, user_msg, size)) {
osm_warn("unable to copy user message\n");
return -EFAULT;
goto out;
}
i2o_dump_message(msg);

if (get_user(reply_size, &user_reply[0]) < 0)
return -EFAULT;
goto out;

reply_size >>= 16;
reply_size <<= 2;

rcode = -ENOMEM;
reply = kzalloc(reply_size, GFP_KERNEL);
if (!reply) {
printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
c->name);
return -ENOMEM;
goto out;
}

sg_offset = (msg->u.head[0] >> 4) & 0x0f;
Expand Down Expand Up @@ -661,21 +665,22 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
}

rcode = i2o_msg_post_wait(c, msg, 60);
msg = NULL;
if (rcode) {
reply[4] = ((u32) rcode) << 24;
goto sg_list_cleanup;
}

if (sg_offset) {
u32 msg[I2O_OUTBOUND_MSG_FRAME_SIZE];
u32 rmsg[I2O_OUTBOUND_MSG_FRAME_SIZE];
/* Copy back the Scatter Gather buffers back to user space */
u32 j;
// TODO 64bit fix
struct sg_simple_element *sg;
int sg_size;

// re-acquire the original message to handle correctly the sg copy operation
memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
memset(&rmsg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
// get user msg size in u32s
if (get_user(size, &user_msg[0])) {
rcode = -EFAULT;
Expand All @@ -684,15 +689,15 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
size = size >> 16;
size *= 4;
/* Copy in the user's I2O command */
if (copy_from_user(msg, user_msg, size)) {
if (copy_from_user(rmsg, user_msg, size)) {
rcode = -EFAULT;
goto sg_list_cleanup;
}
sg_count =
(size - sg_offset * 4) / sizeof(struct sg_simple_element);

// TODO 64bit fix
sg = (struct sg_simple_element *)(msg + sg_offset);
sg = (struct sg_simple_element *)(rmsg + sg_offset);
for (j = 0; j < sg_count; j++) {
/* Copy out the SG list to user's buffer if necessary */
if (!
Expand All @@ -714,7 +719,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
}
}

sg_list_cleanup:
sg_list_cleanup:
/* Copy back the reply to user space */
if (reply_size) {
// we wrote our own values for context - now restore the user supplied ones
Expand All @@ -723,20 +728,21 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
"%s: Could not copy message context FROM user\n",
c->name);
rcode = -EFAULT;
goto sg_list_cleanup;
}
if (copy_to_user(user_reply, reply, reply_size)) {
printk(KERN_WARNING
"%s: Could not copy reply TO user\n", c->name);
rcode = -EFAULT;
}
}

for (i = 0; i < sg_index; i++)
i2o_dma_free(&c->pdev->dev, &sg_list[i]);

cleanup:
cleanup:
kfree(reply);
out:
if (msg)
i2o_msg_nop(c, msg);
return rcode;
}

Expand Down Expand Up @@ -793,8 +799,6 @@ static int i2o_cfg_passthru(unsigned long arg)
return -ENXIO;
}

msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);

sb = c->status_block.virt;

if (get_user(size, &user_msg[0]))
Expand All @@ -810,12 +814,17 @@ static int i2o_cfg_passthru(unsigned long arg)

size <<= 2; // Convert to bytes

msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
if (IS_ERR(msg))
return PTR_ERR(msg);

rcode = -EFAULT;
/* Copy in the user's I2O command */
if (copy_from_user(msg, user_msg, size))
return -EFAULT;
goto out;

if (get_user(reply_size, &user_reply[0]) < 0)
return -EFAULT;
goto out;

reply_size >>= 16;
reply_size <<= 2;
Expand All @@ -824,7 +833,8 @@ static int i2o_cfg_passthru(unsigned long arg)
if (!reply) {
printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
c->name);
return -ENOMEM;
rcode = -ENOMEM;
goto out;
}

sg_offset = (msg->u.head[0] >> 4) & 0x0f;
Expand Down Expand Up @@ -891,21 +901,22 @@ static int i2o_cfg_passthru(unsigned long arg)
}

rcode = i2o_msg_post_wait(c, msg, 60);
msg = NULL;
if (rcode) {
reply[4] = ((u32) rcode) << 24;
goto sg_list_cleanup;
}

if (sg_offset) {
u32 msg[128];
u32 rmsg[128];
/* Copy back the Scatter Gather buffers back to user space */
u32 j;
// TODO 64bit fix
struct sg_simple_element *sg;
int sg_size;

// re-acquire the original message to handle correctly the sg copy operation
memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
memset(&rmsg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
// get user msg size in u32s
if (get_user(size, &user_msg[0])) {
rcode = -EFAULT;
Expand All @@ -914,15 +925,15 @@ static int i2o_cfg_passthru(unsigned long arg)
size = size >> 16;
size *= 4;
/* Copy in the user's I2O command */
if (copy_from_user(msg, user_msg, size)) {
if (copy_from_user(rmsg, user_msg, size)) {
rcode = -EFAULT;
goto sg_list_cleanup;
}
sg_count =
(size - sg_offset * 4) / sizeof(struct sg_simple_element);

// TODO 64bit fix
sg = (struct sg_simple_element *)(msg + sg_offset);
sg = (struct sg_simple_element *)(rmsg + sg_offset);
for (j = 0; j < sg_count; j++) {
/* Copy out the SG list to user's buffer if necessary */
if (!
Expand All @@ -944,7 +955,7 @@ static int i2o_cfg_passthru(unsigned long arg)
}
}

sg_list_cleanup:
sg_list_cleanup:
/* Copy back the reply to user space */
if (reply_size) {
// we wrote our own values for context - now restore the user supplied ones
Expand All @@ -964,8 +975,11 @@ static int i2o_cfg_passthru(unsigned long arg)
for (i = 0; i < sg_index; i++)
kfree(sg_list[i]);

cleanup:
cleanup:
kfree(reply);
out:
if (msg)
i2o_msg_nop(c, msg);
return rcode;
}
#endif
Expand Down

0 comments on commit 28191a4

Please sign in to comment.