[src/trunk]: src/sys/ufs/ffs memcpy di_extb/db/ib separately. Noted by Cover...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58f1f0fd32d1
branches:  trunk
changeset: 338383:58f1f0fd32d1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 20 18:21:17 2015 +0000

description:
memcpy di_extb/db/ib separately.  Noted by Coverity, CID 974636.

diffstat:

 sys/ufs/ffs/ffs_bswap.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 8fcc361e3275 -r 58f1f0fd32d1 sys/ufs/ffs/ffs_bswap.c
--- a/sys/ufs/ffs/ffs_bswap.c   Wed May 20 18:19:09 2015 +0000
+++ b/sys/ufs/ffs/ffs_bswap.c   Wed May 20 18:21:17 2015 +0000
@@ -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 @@
        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