Commit 2b3097a2 authored by Peter Hurley's avatar Peter Hurley Committed by Linus Torvalds

ipc: set EFAULT as default error in load_msg()

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Acked-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent da085d45
...@@ -84,7 +84,7 @@ struct msg_msg *load_msg(const void __user *src, int len) ...@@ -84,7 +84,7 @@ struct msg_msg *load_msg(const void __user *src, int len)
{ {
struct msg_msg *msg; struct msg_msg *msg;
struct msg_msgseg *seg; struct msg_msgseg *seg;
int err; int err = -EFAULT;
int alen; int alen;
msg = alloc_msg(len); msg = alloc_msg(len);
...@@ -92,19 +92,15 @@ struct msg_msg *load_msg(const void __user *src, int len) ...@@ -92,19 +92,15 @@ struct msg_msg *load_msg(const void __user *src, int len)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
alen = min(len, DATALEN_MSG); alen = min(len, DATALEN_MSG);
if (copy_from_user(msg + 1, src, alen)) { if (copy_from_user(msg + 1, src, alen))
err = -EFAULT;
goto out_err; goto out_err;
}
for (seg = msg->next; seg != NULL; seg = seg->next) { for (seg = msg->next; seg != NULL; seg = seg->next) {
len -= alen; len -= alen;
src = (char __user *)src + alen; src = (char __user *)src + alen;
alen = min(len, DATALEN_SEG); alen = min(len, DATALEN_SEG);
if (copy_from_user(seg + 1, src, alen)) { if (copy_from_user(seg + 1, src, alen))
err = -EFAULT;
goto out_err; goto out_err;
}
} }
err = security_msg_msg_alloc(msg); err = security_msg_msg_alloc(msg);
......
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