question about klen in move_addr_to_user()
Subsystems (3)
Smatch complains that about a potential buffer overflow in move_add_to_user()
net/socket.c
212 static int move_addr_to_user(struct sockaddr_storage *kaddr, int klen,
213 void __user *uaddr, int __user *ulen)
214 {
215 int err;
216 int len;
217
218 err = get_user(len, ulen);
219 if (err)
220 return err;
221 if (len > klen)
222 len = klen;
223 if (len < 0 || len > sizeof(struct sockaddr_storage))
224 return -EINVAL;
225 if (len) {
226 if (audit_sockaddr(klen, kaddr))
^^^^
Smatch complains that although "len" is capped here, "klen" hasn't necessarily been. If "klen" is more than 128 bytes it leads to memory corruption.
227 return -ENOMEM;
228 if (copy_to_user(uaddr, kaddr, len))
229 return -EFAULT;
230 }
The call tree is this:
__sys_recvmsg() gets the msg->msg_namelen from the user.
Normally the network protocols set msg->msg_namelen in their ->recvmsg() function but some don't like caif_seqpkt_recvmsg() and recv_msg() for tipc.
regards,
dan carpenter
David Miller
maintainerFrom: Dan Carpenter <[email protected]>
Date: Mon, 18 Mar 2013 13:10:07 +0300
Quoted 7 lines
The call tree is this:
__sys_recvmsg()gets themsg->msg_namelenfrom the user.Normally the network protocols set
msg->msg_namelenin their ->recvmsg() function but some don't likecaif_seqpkt_recvmsg()andrecv_msg()for tipc.
In fact, even TCP will just leave the msg->msg_namelen alone.
I think the best thing to do is to cap the klen to the size of sockaddr_storage in verify_iovec() when mode is not VERIFY_READ.
But actually, it looks like sendmsg() has a similar problem. We use m->msg_namelen as-is in verify_iovec() via __sys_sendmsg() when mode is VERIFY_READ.
This makes me think that we should cap this at the precise moment we import the user's msghdr. Which means:
1) Create a helper function copy_msghdr_from_user() and use it everywhere we do the straight copy_from_user(msg_sys, ...)
2) In both copy_msghdr_from_user() and get_compat_msghdr(), cap the msg_namelen to sizeof(struct sockaddr_storage).
That should eliminate any and all problems in this area.
Thanks Dan.
PATCH 1/1 net: heap overflow in __audit_sockaddr()
We need to cap ->msg_namelen or it leads to a buffer overflow when we to the memcpy() in __audit_sockaddr(). It requires CAP_AUDIT_CONTROL to exploit this bug.
The call tree is:___sys_recvmsg()
move_addr_to_user()
audit_sockaddr()
__audit_sockaddr()net/socket.c +20 -4
@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len; }; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ; +} +static int ___sys_sendmsg (struct socket *sock,struct msghdr __user *msg,struct msghdr *msg_sys,unsigned int flags,struct used_address *used_address)
@@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }if (msg_sys->msg_iovlen >UIO_FASTIOV ) { err = -EMSGSIZE ;
@@ -2191,8 +2204,11 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }if (msg_sys->msg_iovlen >UIO_FASTIOV ) { err = -EMSGSIZE ;
Re: [patch] net: heap overflow in __audit_sockaddr()
Quoted 35 lines · Dan Carpenter
We need to cap ->msg_namelen or it leads to a buffer overflow when we to the
memcpy()in__audit_sockaddr(). It requiresCAP_AUDIT_CONTROLto exploit this bug.The call tree is:
___sys_recvmsg()
move_addr_to_user()audit_sockaddr() __audit_sockaddr()Reported-by Jüri Aedla <[email protected]>Signed-off-by Dan Carpenter <[email protected]>net/socket.c +10
-0@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len; }; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ; +} +static int ___sys_sendmsg (struct socket *sock,struct msghdr __user *msg,struct msghdr *msg_sys,unsigned int flags,struct used_address *used_address)
net/socket.c static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, · line 1999
Quoted 10 lines
net/socket.c +5
-2@@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }
[...]
This doesn't cover compat tasks, since get_compat_msghdr() has no such check.
Ben.
Signature · 3 lines
Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
Re: [patch] net: heap overflow in __audit_sockaddr()
Quoted 48 lines · Ben Hutchings
Quoted 45 lines · Dan Carpenter
We need to cap ->msg_namelen or it leads to a buffer overflow when we to the
memcpy()in__audit_sockaddr(). It requiresCAP_AUDIT_CONTROLto exploit this bug.The call tree is:
___sys_recvmsg()
move_addr_to_user()audit_sockaddr() __audit_sockaddr()Reported-by Jüri Aedla <[email protected]>Signed-off-by Dan Carpenter <[email protected]>net/socket.c +15
-2@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len; }; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ; +} +static int ___sys_sendmsg (struct socket *sock,struct msghdr __user *msg,struct msghdr *msg_sys,unsigned int flags,struct used_address *used_address)@@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }[...]
Quoted 3 lines
This doesn't cover compat tasks, since
get_compat_msghdr()has no such check.
Oops. Gar... Thanks for catching that. I forgot to add that chunk to the commit.
regards,
dan carpenter
PATCH v2 1/1 net: heap overflow in __audit_sockaddr()
In reply to Ben HutchingsWe need to cap ->msg_namelen or it leads to a buffer overflow when we to the memcpy() in __audit_sockaddr(). It requires CAP_AUDIT_CONTROL to exploit this bug.
The call tree is:___sys_recvmsg()
move_addr_to_user()
audit_sockaddr()
__audit_sockaddr()---
v2: The limit check to the compat code was missing as pointed out by Ben Hutchings.
net/socket.c +20 -4
@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len; }; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ; +} +static int ___sys_sendmsg (struct socket *sock,struct msghdr __user *msg,struct msghdr *msg_sys,unsigned int flags,struct used_address *used_address)
@@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }if (msg_sys->msg_iovlen >UIO_FASTIOV ) { err = -EMSGSIZE ;
@@ -2191,8 +2204,11 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,if (MSG_CMSG_COMPAT & flags) {if (get_compat_msghdr (msg_sys, msg_compat))return -EFAULT ; - }else if (copy_from_user (msg_sys, msg,sizeof (struct msghdr ))) -return -EFAULT ; + }else { + err =copy_msghdr_from_user (msg_sys, msg); +if (err) +return err; + }if (msg_sys->msg_iovlen >UIO_FASTIOV ) { err = -EMSGSIZE ;
net/compat.c +2 -0
@@ -71,6 +71,8 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)__get_user (kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) return -EFAULT; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; kmsg->msg_name =compat_ptr (tmp1); kmsg->msg_iov =compat_ptr (tmp2); kmsg->msg_control =compat_ptr (tmp3);
David Miller
maintainerRe: [patch v2] net: heap overflow in __audit_sockaddr()
From: Dan Carpenter <[email protected]>
Date: Thu, 3 Oct 2013 00:27:20 +0300
Quoted 7 lines
We need to cap ->msg_namelen or it leads to a buffer overflow when we to the
memcpy()in__audit_sockaddr(). It requiresCAP_AUDIT_CONTROLto exploit this bug.The call tree is:
___sys_recvmsg()
move_addr_to_user()
Quoted 8 lines
audit_sockaddr() __audit_sockaddr()Reported-by Jüri Aedla <[email protected]>Signed-off-by Dan Carpenter <[email protected]>---
v2: The limit check to the compat code was missing as pointed out by Ben Hutchings.
Applied and queued up for -stable, thanks Dan.
Re: [patch v2] net: heap overflow in __audit_sockaddr()
In reply to Dan CarpenterQuoted 4 lines · Dan Carpenter
net/socket.c +0
-0@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len;
net/socket.c struct used_address { · line 1974
Quoted 10 lines
net/socket.c +8
-0}; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ;
Crap, this seems to break Ruby trunk :x
https://bugs.ruby-lang.org/issues/9124
I'm inclined to think Ruby is wrong to use a gigantic buffer, but this may also break some other existing userspace code. I'm not sure what the best option since breaking userspace (even buggy userspace?) is not taken lightly.
Is there a different way to fix this in the kernel?
Note: this doesn't affect a stable release of Ruby, yet.
(Not a Ruby developer myself, just occasional contributor).
Re: [patch v2] net: heap overflow in __audit_sockaddr()
Quoted 19 lines · Eric Wong
Quoted 4 lines · Dan Carpenter
net/socket.c +0
-0@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len;net/socket.c struct used_address { · line 1974
Quoted 10 lines
net/socket.c +8
-0}; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ;Crap, this seems to break Ruby trunk :x
https://bugs.ruby-lang.org/issues/9124
Quoted 8 lines
I'm inclined to think Ruby is wrong to use a gigantic buffer, but this may also break some other existing userspace code. I'm not sure what the best option since breaking userspace (even buggy userspace?) is not taken lightly.
Is there a different way to fix this in the kernel?
Note: this doesn't affect a stable release of Ruby, yet.
We have to clamp msg_namelen to max sizeof(struct sockaddr_storage). The sendmsg handler will check msg_namelen again and error out correctly if the size of msg_name is too short.
Greetings,
Hannes
PATCH 1/1 net: clamp ->msg_namelen instead of returning an error
If kmsg->msg_namelen > sizeof(struct sockaddr_storage) then in the original code that would lead to memory corruption in the kernel if you had audit configured. If you didn't have audit configured it was harmless.
There are some programs such as beta versions of Ruby which use too large of a buffer and returning an error code breaks them. We should clamp the ->msg_namelen value instead.
net/socket.c +1 -1
@@ -1973,7 +1973,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,if (copy_from_user (kmsg, umsg,sizeof (struct msghdr )))return -EFAULT ;if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) -return -EINVAL ; + kmsg->msg_namelen =sizeof (struct sockaddr_storage );return 0 ; }
net/compat.c +1 -1
@@ -72,7 +72,7 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) __get_user(kmsg->msg_flags, &umsg->msg_flags))return -EFAULT ;if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) -return -EINVAL ; + kmsg->msg_namelen =sizeof (struct sockaddr_storage ); kmsg->msg_name =compat_ptr (tmp1); kmsg->msg_iov =compat_ptr (tmp2); kmsg->msg_control =compat_ptr (tmp3);
Re: [patch] net: clamp ->msg_namelen instead of returning an error
Quoted 10 lines · Dan Carpenter
If
kmsg->msg_namelen>sizeof(struct sockaddr_storage)then in the original code that would lead to memory corruption in the kernel if you had audit configured. If you didn't have audit configured it was harmless.There are some programs such as beta versions of Ruby which use too large of a buffer and returning an error code breaks them. We should clamp the ->msg_namelen value instead.
Reported-by Eric Wong <[email protected]>
Thanks Dan, Ruby trunk r43886 works out-of-the-box with this fix.
Dave: please queue for stable, thanks
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>
Re: [patch] net: clamp ->msg_namelen instead of returning an error
In reply to Dan CarpenterQuoted 11 lines · Dan Carpenter
If
kmsg->msg_namelen>sizeof(struct sockaddr_storage)then in the original code that would lead to memory corruption in the kernel if you had audit configured. If you didn't have audit configured it was harmless.There are some programs such as beta versions of Ruby which use too large of a buffer and returning an error code breaks them. We should clamp the ->msg_namelen value instead.
Reported-by Eric Wong <[email protected]>Signed-off-by Dan Carpenter <[email protected]>
David Miller
maintainerRe: [patch] net: clamp ->msg_namelen instead of returning an error
From: Eric Dumazet <[email protected]>
Date: Wed, 27 Nov 2013 13:27:46 -0800
Quoted 10 lines · Dan Carpenter
Quoted 9 lines
If
kmsg->msg_namelen>sizeof(struct sockaddr_storage)then in the original code that would lead to memory corruption in the kernel if you had audit configured. If you didn't have audit configured it was harmless.There are some programs such as beta versions of Ruby which use too large of a buffer and returning an error code breaks them. We should clamp the ->msg_namelen value instead.
Quoted 6 lines
Quoted 2 lines
Reported-by Eric Wong <[email protected]>Signed-off-by Dan Carpenter <[email protected]>Fixes 1661bf364ae9 ("net: heap overflow in __audit_sockaddr()")Acked-by Eric Dumazet <[email protected]>
Applied and queued up for -stable, thanks everyone.
Re: [patch v2] net: heap overflow in __audit_sockaddr()
In reply to Hannes Frederic SowaQuoted 4 lines · Hannes Frederic Sowa
We have to clamp
msg_namelento maxsizeof(struct sockaddr_storage). The sendmsg handler will checkmsg_namelenagain and error out correctly if the size ofmsg_nameis too short.
Yeah, clamping sounds like the right thing to do at least for receiving. For sending, you should say "we can't send packets that big due to memory constraints" (of, for the case of a sockaddr, "to an address this big"), but for receiving the size of the user space buffer is kind of irrelevant - if the user gives a bigger buffer than necessary, who cares? We just need to make sure that the kernel doesn't then allocate silly-big temporary buffers internally.
There seems to be a patch floating around to clamp things already.
Linus
Re: [patch v2] net: heap overflow in __audit_sockaddr()
Quoted 15 lines · Linus Torvalds
Quoted 4 lines · Hannes Frederic Sowa
We have to clamp
msg_namelento maxsizeof(struct sockaddr_storage). The sendmsg handler will checkmsg_namelenagain and error out correctly if the size ofmsg_nameis too short.Yeah, clamping sounds like the right thing to do at least for receiving. For sending, you should say "we can't send packets that big due to memory constraints" (of, for the case of a sockaddr, "to an address this big"), but for receiving the size of the user space buffer is kind of irrelevant - if the user gives a bigger buffer than necessary, who cares? We just need to make sure that the kernel doesn't then allocate silly-big temporary buffers internally.
Quoted 1 line
There seems to be a patch floating around to clamp things already.
Data buffers are clamed fine already.
The sockaddr buffers are currently always 128 bytes (== sizeof(struct sockaddr_storage)) in size and are allocated on the stack of the recvmsg/sendmsg syscall handlers. We normally don't have high stack usage on recvmsg calls but it could be worth trying to optimize that on sendmsg, I agree. I have not seen a patch which tries to do so but maybe I haven't looked far enough back in the mailing list archives.
Clamping on sending seems necessary to not break exisiting applications. I guess those programs expect the kernel to know which namelen the protocol expects and only use that part of the provided sockaddr buffer (an example is the mentioned ruby bug in this thread which seems to pass down the size of a union for all possile sockaddrs:
<https://bugs.ruby-lang.org/issues/9124#note-2>).
I recently noticed a some more subtile annoyance in that code:
We don't know the anticipated sockaddr size before calling the recvmsg handler. Hence it is currently possible that we dequeue a packet from the socket receiving queue and later error out and drop the packet because the user provided a socket address buffer which is too small. IMHO we should catch that before dequeueing the packet. Either we can export the address size via the per-protocol-structures or we have to start passing the user provided buffer sizes down the stack (currently all recvmsg handlers expect to always have 128 bytes for storing addresses).
I'll look into this.
Greetings,
Hannes
RE: [patch v2] net: heap overflow in __audit_sockaddr()
In reply to Eric WongQuoted 20 lines
From: Eric Wong
Quoted 4 lines · Dan Carpenter
net/socket.c +0
-0@@ -1964,6 +1964,16 @@ struct used_address {unsigned int name_len;net/socket.c struct used_address { · line 1974
Quoted 10 lines
net/socket.c +8
-0}; +static int copy_msghdr_from_user (struct msghdr *kmsg, +struct msghdr __user *umsg) +{ +if (copy_from_user (kmsg, umsg,sizeof (struct msghdr ))) +return -EFAULT ; +if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) +return -EINVAL ; +return 0 ;Crap, this seems to break Ruby trunk :x
https://bugs.ruby-lang.org/issues/9124
Quoted 4 lines
I'm inclined to think Ruby is wrong to use a gigantic buffer, but this may also break some other existing userspace code. I'm not sure what the best option since breaking userspace (even buggy userspace?) is not taken lightly.
Well, 'struct sockaddr_storage' is a horrid item.
I think there are people who'll say that it should never be used to allocate an actual buffer.
If the kernel is going to write an address into the buffer, it only needs a buffer that is long enough.
If the kernel is going to read an address, the length needs to be appropriate for the actual protocol.
Very portable code, and code that wants to be 'future proof' against new protocols might well use a long buffer.
David