From 28cac2016e123a092af009e58858faca2ffeb76b Mon Sep 17 00:00:00 2001 From: maxv Date: Sun, 8 Sep 2019 18:46:32 +0000 Subject: Hum, remove incorrect assignment. Userland could have passed a smaller namelen, and the uninitialized bytes from sb_data were being used later in the network stack. --- sys/compat/linux/common/linux_socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sys/compat/linux/common/linux_socket.c') diff --git a/sys/compat/linux/common/linux_socket.c b/sys/compat/linux/common/linux_socket.c index ea481c9a6f6..38787a97f9f 100644 --- a/sys/compat/linux/common/linux_socket.c +++ b/sys/compat/linux/common/linux_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.148 2019/08/24 14:18:43 maxv Exp $ */ +/* $NetBSD: linux_socket.c,v 1.149 2019/09/08 18:46:32 maxv Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.148 2019/08/24 14:18:43 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.149 2019/09/08 18:46:32 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -1609,9 +1609,6 @@ linux_get_sa(struct lwp *l, int s, struct sockaddr_big *sb, sin6->sin6_scope_id = 0; } - if (bdom == AF_INET) - namelen = sizeof(struct sockaddr_in); - sb->sb_family = bdom; sb->sb_len = namelen; ktrkuser("mbsoname", sb, namelen); -- cgit