Re: [PATCH] getsockopt() early argument sanity checking
From: Eugene Teo <hidden>
Date: 2006-08-21 12:10:37
Also in:
lkml
Willy Tarreau wrote:
On Sun, Aug 20, 2006 at 02:05:20AM +0200, Michael Buesch wrote:quoted
On Sunday 20 August 2006 01:48, Willy Tarreau wrote:quoted
On Sun, Aug 20, 2006 at 03:05:32AM +0400, Solar Designer wrote:
[snipped]
quoted hunk ↗ jump to hunk
diff --git a/net/socket.c b/net/socket.c index ac45b13..910ef88 100644 --- a/net/socket.c +++ b/net/socket.c@@ -1307,11 +1307,17 @@ asmlinkage long sys_setsockopt(int fd, i asmlinkage long sys_getsockopt(int fd, int level, int optname, char *optval, int *optlen) { int err; + int len;
^^^^^^^^
struct socket *sock;
if ((sock = sockfd_lookup(fd, &err))!=NULL)
{
- if (level == SOL_SOCKET)
+ /* XXX: insufficient for SMP, but should be redundant anyway */
+ if (get_user(len, optlen))
+ err = -EFAULT;
+ else if (len < 0)^^^^^^^^^^^^^^^^^ s/else//
+ err = -EINVAL; + else if (level == SOL_SOCKET)
s/else//
err=sock_getsockopt(sock,level,optname,optval,optlen); else err=sock->ops->getsockopt(sock, level, optname, optval, optlen);
These checks are already in getsockopt(). Duplicated code? Eugene -- eteo redhat.com ph: +65 6490 4142 http://www.kernel.org/~eugeneteo gpg fingerprint: 47B9 90F6 AE4A 9C51 37E0 D6E1 EA84 C6A2 58DF 8823