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

xfrm_user_policy(): 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:16:28 -04:00
parent 02412e9b4e
commit 7f2d17c67a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/xfrm/xfrm_state.c
View File

@ -2023,13 +2023,9 @@ int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen
if (optlen <= 0 || optlen > PAGE_SIZE) if (optlen <= 0 || optlen > PAGE_SIZE)
return -EMSGSIZE; return -EMSGSIZE;
data = kmalloc(optlen, GFP_KERNEL); data = memdup_user(optval, optlen);
if (!data) if (IS_ERR(data))
return -ENOMEM; return PTR_ERR(data);
err = -EFAULT;
if (copy_from_user(data, optval, optlen))
goto out;
err = -EINVAL; err = -EINVAL;
rcu_read_lock(); rcu_read_lock();
@ -2047,7 +2043,6 @@ int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen
err = 0; err = 0;
} }
out:
kfree(data); kfree(data);
return err; return err;
} }