diff options
author | Thomas Meyer <thomas@m3y3r.de> | 2013-06-01 05:39:36 -0400 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2013-06-07 20:26:55 -0400 |
commit | fc8b14d338f6265533a8f82db1325fa112b530ba (patch) | |
tree | e110eda47c23c7008338e308bfffe197c67d6e25 /fs/ecryptfs | |
parent | e8193ce572f0ddb8004acf976bba119f0abbe6ca (diff) |
eCryptfs: Cocci spatch "memdup.spatch"
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/messaging.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index 49ff8ea08f1c..e57380e5f6bd 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c | |||
@@ -247,14 +247,13 @@ int ecryptfs_process_response(struct ecryptfs_daemon *daemon, | |||
247 | goto unlock; | 247 | goto unlock; |
248 | } | 248 | } |
249 | msg_size = (sizeof(*msg) + msg->data_len); | 249 | msg_size = (sizeof(*msg) + msg->data_len); |
250 | msg_ctx->msg = kmalloc(msg_size, GFP_KERNEL); | 250 | msg_ctx->msg = kmemdup(msg, msg_size, GFP_KERNEL); |
251 | if (!msg_ctx->msg) { | 251 | if (!msg_ctx->msg) { |
252 | rc = -ENOMEM; | 252 | rc = -ENOMEM; |
253 | printk(KERN_ERR "%s: Failed to allocate [%zd] bytes of " | 253 | printk(KERN_ERR "%s: Failed to allocate [%zd] bytes of " |
254 | "GFP_KERNEL memory\n", __func__, msg_size); | 254 | "GFP_KERNEL memory\n", __func__, msg_size); |
255 | goto unlock; | 255 | goto unlock; |
256 | } | 256 | } |
257 | memcpy(msg_ctx->msg, msg, msg_size); | ||
258 | msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_DONE; | 257 | msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_DONE; |
259 | wake_up_process(msg_ctx->task); | 258 | wake_up_process(msg_ctx->task); |
260 | rc = 0; | 259 | rc = 0; |