Module Name: src
Committed By: riastradh
Date: Wed May 20 18:21:17 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_bswap.c
Log Message:
memcpy di_extb/db/ib separately. Noted by Coverity, CID 974636.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/ufs/ffs/ffs_bswap.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/ufs/ffs/ffs_bswap.c
diff -u src/sys/ufs/ffs/ffs_bswap.c:1.38 src/sys/ufs/ffs/ffs_bswap.c:1.39
--- src/sys/ufs/ffs/ffs_bswap.c:1.38 Wed May 20 18:19:09 2015
+++ src/sys/ufs/ffs/ffs_bswap.c Wed May 20 18:21:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_bswap.c,v 1.38 2015/05/20 18:19:09 riastradh Exp $ */
+/* $NetBSD: ffs_bswap.c,v 1.39 2015/05/20 18:21:17 riastradh Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.38 2015/05/20 18:19:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.39 2015/05/20 18:21:17 riastradh Exp $");
#include <sys/param.h>
#if defined(_KERNEL)
@@ -159,7 +159,9 @@ ffs_dinode2_swap(struct ufs2_dinode *o,
n->di_kernflags = bswap32(o->di_kernflags);
n->di_flags = bswap32(o->di_flags);
n->di_extsize = bswap32(o->di_extsize);
- memcpy(n->di_extb, o->di_extb, (UFS_NXADDR + UFS_NDADDR + UFS_NIADDR) * 8);
+ memcpy(n->di_extb, o->di_extb, sizeof(n->di_extb));
+ memcpy(n->di_db, o->di_db, sizeof(n->di_db));
+ memcpy(n->di_ib, o->di_ib, sizeof(n->di_ib));
}
void
