diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-30 16:12:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-30 16:12:20 -0700 |
| commit | b7058842c940ad2c08dd829b21e5c92ebe3b8758 (patch) | |
| tree | 5fe78d599fc345ca0bcd4b083b79095a54b2921b /net/dccp/proto.c | |
| parent | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (diff) | |
| download | kernel_samsung_aries-b7058842c940ad2c08dd829b21e5c92ebe3b8758.zip kernel_samsung_aries-b7058842c940ad2c08dd829b21e5c92ebe3b8758.tar.gz kernel_samsung_aries-b7058842c940ad2c08dd829b21e5c92ebe3b8758.tar.bz2 | |
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 <davem@davemloft.net>
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index bc44670..a156319 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -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, |