From: Ani Sinha <a...@arista.com>
3.4.107-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 6a2a2b3ae0759843b22c929881cc184b00cc63ff upstream.
Linux manpage for recvmsg and sendmsg calls does not explicitly mention setting
msg_namelen to 0 when
msg_name passed set as NULL. When developers don't set msg_namelen member in
msghdr, it might contain garbage
value which will fail the validation check and sendmsg and recvmsg calls from
kernel will return EINVAL. This will
break old binaries and any code for which there is no access to source code.
To fix this, we set msg_namelen to 0 when msg_name is passed as NULL from
userland.
Signed-off-by: Ani Sinha <a...@arista.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Cc: Michal Marek <mma...@suse.cz>
Signed-off-by: Zefan Li <lize...@huawei.com>
---
net/socket.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/socket.c b/net/socket.c
index cc3fc4d..025f7f4 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1908,6 +1908,9 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
if (copy_from_user(kmsg, umsg, sizeof(struct msghdr)))
return -EFAULT;
+ if (kmsg->msg_name == NULL)
+ kmsg->msg_namelen = 0;
+
if (kmsg->msg_namelen < 0)
return -EINVAL;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
