Skip to content

Commit 2b3097a

Browse files
peterhurleytorvalds
authored andcommitted
ipc: set EFAULT as default error in load_msg()
Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Acked-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent da085d4 commit 2b3097a

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

ipc/msgutil.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,27 +84,23 @@ struct msg_msg *load_msg(const void __user *src, int len)
8484
{
8585
struct msg_msg *msg;
8686
struct msg_msgseg *seg;
87-
int err;
87+
int err = -EFAULT;
8888
int alen;
8989

9090
msg = alloc_msg(len);
9191
if (msg == NULL)
9292
return ERR_PTR(-ENOMEM);
9393

9494
alen = min(len, DATALEN_MSG);
95-
if (copy_from_user(msg + 1, src, alen)) {
96-
err = -EFAULT;
95+
if (copy_from_user(msg + 1, src, alen))
9796
goto out_err;
98-
}
9997

10098
for (seg = msg->next; seg != NULL; seg = seg->next) {
10199
len -= alen;
102100
src = (char __user *)src + alen;
103101
alen = min(len, DATALEN_SEG);
104-
if (copy_from_user(seg + 1, src, alen)) {
105-
err = -EFAULT;
102+
if (copy_from_user(seg + 1, src, alen))
106103
goto out_err;
107-
}
108104
}
109105

110106
err = security_msg_msg_alloc(msg);

0 commit comments

Comments
 (0)