Module Name: src
Committed By: riastradh
Date: Wed Jan 15 13:52:30 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Fix copyoutstr usage in drm_version_string.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/sys/external/bsd/drm2/drm/drm_drv.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/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.23 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.24
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.23 Sun Sep 8 15:34:36 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jan 15 13:52:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.23 2013/09/08 15:34:36 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.24 2014/01/15 13:52:30 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.23 2013/09/08 15:34:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.24 2014/01/15 13:52:30 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -677,7 +677,9 @@ drm_version_string(char *target, size_t
*lenp = len;
if ((trunc_len > 0) && (target != NULL))
- return copyoutstr(source, target, trunc_len, NULL);
+ /* copyoutstr takes a buffer size, not a string length. */
+ /* XXX errno NetBSD->Linux */
+ return -copyoutstr(source, target, trunc_len+1, NULL);
return 0;
}
