2013-06-01 09:39:44

by Thomas Meyer

[permalink] [raw]

Subject: [PATCH] eCryptfs: Cocci spatch "memdup.spatch"

---

Signed-off-by: Thomas Meyer <[email protected]>
---

diff -u -p a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -247,14 +247,13 @@ int ecryptfs_process_response(struct ecr
goto unlock;
}
msg_size = (sizeof(*msg) + msg->data_len);
- msg_ctx->msg = kmalloc(msg_size, GFP_KERNEL);
+ msg_ctx->msg = kmemdup(msg, msg_size, GFP_KERNEL);
if (!msg_ctx->msg) {
rc = -ENOMEM;
printk(KERN_ERR "%s: Failed to allocate [%zd] bytes of "
"GFP_KERNEL memory\n", __func__, msg_size);
goto unlock;
}
- memcpy(msg_ctx->msg, msg, msg_size);
msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_DONE;
wake_up_process(msg_ctx->task);
rc = 0;

2013-06-03 02:48:00

by Tyler Hicks

[permalink] [raw]

Subject: Re: [PATCH] eCryptfs: Cocci spatch "memdup.spatch"

---

On 2013-06-01 11:39:36, Thomas Meyer wrote:
>
> Signed-off-by: Thomas Meyer <[email protected]>
> ---

Thanks Thomas - I've pushed this to my next branch.

Tyler

>
> diff -u -p a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
> --- a/fs/ecryptfs/messaging.c
> +++ b/fs/ecryptfs/messaging.c
> @@ -247,14 +247,13 @@ int ecryptfs_process_response(struct ecr
> goto unlock;
> }
> msg_size = (sizeof(*msg) + msg->data_len);
> - msg_ctx->msg = kmalloc(msg_size, GFP_KERNEL);
> + msg_ctx->msg = kmemdup(msg, msg_size, GFP_KERNEL);
> if (!msg_ctx->msg) {
> rc = -ENOMEM;
> printk(KERN_ERR "%s: Failed to allocate [%zd] bytes of "
> "GFP_KERNEL memory\n", __func__, msg_size);
> goto unlock;
> }
> - memcpy(msg_ctx->msg, msg, msg_size);
> msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_DONE;
> wake_up_process(msg_ctx->task);
> rc = 0;
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe ecryptfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

---

Attachments:

(No filename) (1.04 kB)
signature.asc (836.00 B)
Digital signature Download all attachments