Module Name: src
Committed By: christos
Date: Wed May 8 14:05:19 UTC 2019
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
PR/54176: Anthony Mallet:
getsockopt(2) does not silently truncate returned optval
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/kern/uipc_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.278 src/sys/kern/uipc_socket.c:1.279
--- src/sys/kern/uipc_socket.c:1.278 Mon Apr 15 06:53:17 2019
+++ src/sys/kern/uipc_socket.c Wed May 8 10:05:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.278 2019/04/15 10:53:17 pgoyette Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.279 2019/05/08 14:05:18 christos Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.278 2019/04/15 10:53:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.279 2019/05/08 14:05:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2082,11 +2082,8 @@ sockopt_set(struct sockopt *sopt, const
return error;
}
- if (sopt->sopt_size < len)
- return EINVAL;
-
- memcpy(sopt->sopt_data, buf, len);
- sopt->sopt_retsize = len;
+ sopt->sopt_retsize = MIN(sopt->sopt_size, len);
+ memcpy(sopt->sopt_data, buf, sopt->sopt_retsize);
return 0;
}
@@ -2146,12 +2143,9 @@ sockopt_setmbuf(struct sockopt *sopt, st
return error;
}
- if (sopt->sopt_size < len)
- return EINVAL;
-
- m_copydata(m, 0, len, sopt->sopt_data);
+ sopt->sopt_retsize = MIN(sopt->sopt_size, len);
+ m_copydata(m, 0, sopt->sopt_retsize, sopt->sopt_data);
m_freem(m);
- sopt->sopt_retsize = len;
return 0;
}
