Module Name: src
Committed By: christos
Date: Fri Jan 13 20:58:59 UTC 2017
Modified Files:
src/sys/compat/common: vfs_syscalls_12.c
Log Message:
convert strcpy to a bounded copy to avoid compiler warnings, although the
reclen test prevents overflow.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/common/vfs_syscalls_12.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/compat/common/vfs_syscalls_12.c
diff -u src/sys/compat/common/vfs_syscalls_12.c:1.31 src/sys/compat/common/vfs_syscalls_12.c:1.32
--- src/sys/compat/common/vfs_syscalls_12.c:1.31 Fri Sep 5 05:21:54 2014
+++ src/sys/compat/common/vfs_syscalls_12.c Fri Jan 13 15:58:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_12.c,v 1.31 2014/09/05 09:21:54 matt Exp $ */
+/* $NetBSD: vfs_syscalls_12.c,v 1.32 2017/01/13 20:58:59 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.31 2014/09/05 09:21:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.32 2017/01/13 20:58:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -196,7 +196,8 @@ again:
idb.d_reclen = (uint16_t)old_reclen;
idb.d_type = (uint8_t)bdp->d_type;
idb.d_namlen = (uint8_t)bdp->d_namlen;
- strcpy(idb.d_name, bdp->d_name);
+ memcpy(idb.d_name, bdp->d_name, MIN(sizeof(idb.d_name),
+ idb.d_namlen));
if ((error = copyout(&idb, outp, old_reclen)))
goto out;
/* advance past this real entry */
