leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do_ip_setsockopt(): don't open-code memdup_user()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-13 18:26:06 -04:00
parent 43727da90e
commit a2c841d942
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/ipv4/ip_sockglue.c
View File

@ -934,14 +934,9 @@ static int do_ip_setsockopt(struct sock *sk, int level,
err = -ENOBUFS; err = -ENOBUFS;
break; break;
} }
msf = kmalloc(optlen, GFP_KERNEL); msf = memdup_user(optval, optlen);
if (!msf) { if (IS_ERR(msf)) {
err = -ENOBUFS; err = PTR_ERR(msf);
break;
}
err = -EFAULT;
if (copy_from_user(msf, optval, optlen)) {
kfree(msf);
break; break;
} }
/* numsrc >= (1G-4) overflow in 32 bits */ /* numsrc >= (1G-4) overflow in 32 bits */
@ -1090,14 +1085,11 @@ static int do_ip_setsockopt(struct sock *sk, int level,
err = -ENOBUFS; err = -ENOBUFS;
break; break;
} }
gsf = kmalloc(optlen, GFP_KERNEL); gsf = memdup_user(optval, optlen);
if (!gsf) { if (IS_ERR(gsf)) {
err = -ENOBUFS; err = PTR_ERR(gsf);
break; break;
} }
err = -EFAULT;
if (copy_from_user(gsf, optval, optlen))
goto mc_msf_out;
/* numsrc >= (4G-140)/128 overflow in 32 bits */ /* numsrc >= (4G-140)/128 overflow in 32 bits */
if (gsf->gf_numsrc >= 0x1ffffff || if (gsf->gf_numsrc >= 0x1ffffff ||