|
@@ -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);
|
|
|
|
- if (!data)
|
|
|
|
- return -ENOMEM;
|
|
|
|
-
|
|
|
|
- err = -EFAULT;
|
|
|
|
- if (copy_from_user(data, optval, optlen))
|
|
|
|
- goto out;
|
|
|
|
|
|
+ data = memdup_user(optval, optlen);
|
|
|
|
+ if (IS_ERR(data))
|
|
|
|
+ return PTR_ERR(data);
|
|
|
|
|
|
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;
|
|
}
|
|
}
|