mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
net: Make setsockopt() optlen be unsigned.
This provides safety against negative optlen at the type level instead of depending upon (sometimes non-trivial) checks against this sprinkled all over the the place, in each and every implementation. Based upon work done by Arjan van de Ven and feedback from Linus Torvalds. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
eb1cf0f8f7
commit
b7058842c9
67 changed files with 149 additions and 153 deletions
|
|
@ -290,14 +290,14 @@ extern int dccp_disconnect(struct sock *sk, int flags);
|
|||
extern int dccp_getsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int __user *optlen);
|
||||
extern int dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int optlen);
|
||||
char __user *optval, unsigned int optlen);
|
||||
#ifdef CONFIG_COMPAT
|
||||
extern int compat_dccp_getsockopt(struct sock *sk,
|
||||
int level, int optname,
|
||||
char __user *optval, int __user *optlen);
|
||||
extern int compat_dccp_setsockopt(struct sock *sk,
|
||||
int level, int optname,
|
||||
char __user *optval, int optlen);
|
||||
char __user *optval, unsigned int optlen);
|
||||
#endif
|
||||
extern int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg);
|
||||
extern int dccp_sendmsg(struct kiocb *iocb, struct sock *sk,
|
||||
|
|
|
|||
|
|
@ -393,7 +393,7 @@ out:
|
|||
EXPORT_SYMBOL_GPL(dccp_ioctl);
|
||||
|
||||
static int dccp_setsockopt_service(struct sock *sk, const __be32 service,
|
||||
char __user *optval, int optlen)
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
struct dccp_service_list *sl = NULL;
|
||||
|
|
@ -464,7 +464,7 @@ static int dccp_setsockopt_cscov(struct sock *sk, int cscov, bool rx)
|
|||
}
|
||||
|
||||
static int dccp_setsockopt_ccid(struct sock *sk, int type,
|
||||
char __user *optval, int optlen)
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
u8 *val;
|
||||
int rc = 0;
|
||||
|
|
@ -494,7 +494,7 @@ static int dccp_setsockopt_ccid(struct sock *sk, int type,
|
|||
}
|
||||
|
||||
static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int optlen)
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
int val, err = 0;
|
||||
|
|
@ -546,7 +546,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
|
|||
}
|
||||
|
||||
int dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int optlen)
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
if (level != SOL_DCCP)
|
||||
return inet_csk(sk)->icsk_af_ops->setsockopt(sk, level,
|
||||
|
|
@ -559,7 +559,7 @@ EXPORT_SYMBOL_GPL(dccp_setsockopt);
|
|||
|
||||
#ifdef CONFIG_COMPAT
|
||||
int compat_dccp_setsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int optlen)
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
if (level != SOL_DCCP)
|
||||
return inet_csk_compat_setsockopt(sk, level, optname,
|
||||
|
|
|
|||
Loading…
Reference in a new issue