summaryrefslogtreecommitdiffstats
path: root/include/net/compat.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-10-01 01:12:20 +0200
committerDavid S. Miller <davem@davemloft.net>2009-10-01 01:12:20 +0200
commitb7058842c940ad2c08dd829b21e5c92ebe3b8758 (patch)
tree5fe78d599fc345ca0bcd4b083b79095a54b2921b /include/net/compat.h
parentMerge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff)
downloadlinux-b7058842c940ad2c08dd829b21e5c92ebe3b8758.tar.xz
linux-b7058842c940ad2c08dd829b21e5c92ebe3b8758.zip
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 'include/net/compat.h')
-rw-r--r--include/net/compat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/compat.h b/include/net/compat.h
index 5bbf8bf9efea..7c3002832d05 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -40,8 +40,8 @@ extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
-extern int compat_mc_setsockopt(struct sock *, int, int, char __user *, int,
- int (*)(struct sock *, int, int, char __user *, int));
+extern int compat_mc_setsockopt(struct sock *, int, int, char __user *, unsigned int,
+ int (*)(struct sock *, int, int, char __user *, unsigned int));
extern int compat_mc_getsockopt(struct sock *, int, int, char __user *,
int __user *, int (*)(struct sock *, int, int, char __user *,
int __user *));