Commit bc909d9d authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by David S. Miller

sendmmsg/sendmsg: fix unsafe user pointer access

Dereferencing a user pointer directly from kernel-space without going
through the copy_from_user family of functions is a bad idea. Two of
such usages can be found in the sendmsg code path called from sendmmsg,
added by

commit c71d8ebe upstream.
commit 5b47b803 in the 3.0-stable tree.

Usages are performed through memcmp() and memcpy() directly. Fix those
by using the already copied msg_sys structure instead of the __user *msg
structure. Note that msg_sys can be set to NULL by verify_compat_iovec()
or verify_iovec(), which requires additional NULL pointer checks.
Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarDavid Goulet <dgoulet@ev0ke.net>
CC: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
CC: Anton Blanchard <anton@samba.org>
CC: David S. Miller <davem@davemloft.net>
CC: stable <stable@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6f59d13
...@@ -1965,8 +1965,9 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg, ...@@ -1965,8 +1965,9 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
* used_address->name_len is initialized to UINT_MAX so that the first * used_address->name_len is initialized to UINT_MAX so that the first
* destination address never matches. * destination address never matches.
*/ */
if (used_address && used_address->name_len == msg_sys->msg_namelen && if (used_address && msg_sys->msg_name &&
!memcmp(&used_address->name, msg->msg_name, used_address->name_len == msg_sys->msg_namelen &&
!memcmp(&used_address->name, msg_sys->msg_name,
used_address->name_len)) { used_address->name_len)) {
err = sock_sendmsg_nosec(sock, msg_sys, total_len); err = sock_sendmsg_nosec(sock, msg_sys, total_len);
goto out_freectl; goto out_freectl;
...@@ -1978,7 +1979,8 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg, ...@@ -1978,7 +1979,8 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
*/ */
if (used_address && err >= 0) { if (used_address && err >= 0) {
used_address->name_len = msg_sys->msg_namelen; used_address->name_len = msg_sys->msg_namelen;
memcpy(&used_address->name, msg->msg_name, if (msg_sys->msg_name)
memcpy(&used_address->name, msg_sys->msg_name,
used_address->name_len); used_address->name_len);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment