Skip to content

M
Mock Turtle
Commit f3c4ef08 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

kernel: save a couple of memcpy in user space 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent ad922622
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 15 deletions
kernel/wrnc-hmq.c
View file @ f3c4ef08
...@@ -539,7 +539,7 @@ static struct wrnc_msg *wrnc_message_pop(struct wrnc_hmq *hmq) ...@@ -539,7 +539,7 @@ static struct wrnc_msg *wrnc_message_pop(struct wrnc_hmq *hmq)
static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg) static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg)
{ {
struct wrnc_dev *wrnc = to_wrnc_dev(hmq->dev.parent); struct wrnc_dev *wrnc = to_wrnc_dev(hmq->dev.parent);
struct wrnc_msg msg_ans; struct wrnc_msg msg_ans, msg_req;
struct wrnc_msg_sync msg; struct wrnc_msg_sync msg;
struct wrnc_hmq *hmq_out; struct wrnc_hmq *hmq_out;
unsigned long flags; unsigned long flags;
...@@ -548,6 +548,9 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg) ...@@ -548,6 +548,9 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg)
/* Copy the message from user space*/ /* Copy the message from user space*/
err = copy_from_user(&msg, uarg, sizeof(struct wrnc_msg_sync)); err = copy_from_user(&msg, uarg, sizeof(struct wrnc_msg_sync));
if (err)
return err;
err = copy_from_user(&msg_req, msg.msg, sizeof(struct wrnc_msg));
if (err) if (err)
return err; return err;
...@@ -569,7 +572,7 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg) ...@@ -569,7 +572,7 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg)
/* Send the message */ /* Send the message */
spin_lock_irqsave(&hmq->lock, flags); spin_lock_irqsave(&hmq->lock, flags);
seq = wrnc_message_push(hmq, &msg.msg); seq = wrnc_message_push(hmq, &msg_req);
spin_unlock_irqrestore(&hmq->lock, flags); spin_unlock_irqrestore(&hmq->lock, flags);
/* Set message sequance to wait */ /* Set message sequance to wait */
...@@ -594,15 +597,10 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg) ...@@ -594,15 +597,10 @@ static int wrnc_ioctl_msg_sync(struct wrnc_hmq *hmq, void __user *uarg)
if (to == 0) if (to == 0)
dev_err(&hmq->dev, dev_err(&hmq->dev,
"The real time application is taking too much time to answer. Something is broken\n"); "The real time application is taking too much time to answer. Something is broken\n");
memset(&msg.msg, 0, sizeof(struct wrnc_msg)); memset(&msg_ans, 0, sizeof(struct wrnc_msg));
goto out_sync;
} }
/* Copy the answer message back to user space */ return copy_to_user(msg.msg, &msg_ans, sizeof(struct wrnc_msg));
memcpy(&msg.msg, &msg_ans, sizeof(struct wrnc_msg));
out_sync:
return copy_to_user(uarg, &msg, sizeof(struct wrnc_msg_sync));
} }
...@@ -692,7 +690,7 @@ static long wrnc_hmq_ioctl(struct file *f, unsigned int cmd, unsigned long arg) ...@@ -692,7 +690,7 @@ static long wrnc_hmq_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
wrnc_ioctl_msg_filter_clean(user, uarg); wrnc_ioctl_msg_filter_clean(user, uarg);
break; break;
default: default:
pr_warn("ual: invalid ioctl command %d\n", cmd); pr_warn("wrnc: invalid ioctl command %d\n", cmd);
return -EINVAL; return -EINVAL;
} }
......
kernel/wrnc-user.h
View file @ f3c4ef08
...@@ -57,7 +57,7 @@ struct wrnc_msg { ...@@ -57,7 +57,7 @@ struct wrnc_msg {
* Message descriptor used to send synchronous messages * Message descriptor used to send synchronous messages
*/ */
struct wrnc_msg_sync { struct wrnc_msg_sync {
struct wrnc_msg msg; /**< the message to send. It will be overwritten by struct wrnc_msg *msg; /**< the message to send. It will be overwritten by
the synchronous answer */ the synchronous answer */
uint16_t index_in; /**< where write the message */ uint16_t index_in; /**< where write the message */
uint16_t index_out; /**< where we expect the synchronous answer */ uint16_t index_out; /**< where we expect the synchronous answer */
......
lib/libwrnc.c
View file @ f3c4ef08
...@@ -735,16 +735,13 @@ int wrnc_hmq_send_and_receive_sync(struct wrnc_hmq *hmq, ...@@ -735,16 +735,13 @@ int wrnc_hmq_send_and_receive_sync(struct wrnc_hmq *hmq,
smsg.index_in = hmq->index; smsg.index_in = hmq->index;
smsg.index_out = index_out; smsg.index_out = index_out;
smsg.timeout_ms = timeout_ms; smsg.timeout_ms = timeout_ms;
memcpy(&smsg.msg, msg, sizeof(struct wrnc_msg)); smsg.msg = msg;
/* Send the message */ /* Send the message */
err = ioctl(hmq->fd, WRNC_IOCTL_MSG_SYNC, &smsg); err = ioctl(hmq->fd, WRNC_IOCTL_MSG_SYNC, &smsg);
if (err) if (err)
return -1; return -1;
/* Copy the answer */
memcpy(msg, &smsg.msg, sizeof(struct wrnc_msg));
msg->error = 0; msg->error = 0;
msg->offset = 0; msg->offset = 0;
msg->direction = WRNC_MSG_DIR_RECEIVE; msg->direction = WRNC_MSG_DIR_RECEIVE;
......
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