diff options
| author |   millert <millert@openbsd.org> | 2019-02-06 16:21:27 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2019-02-06 16:21:27 +0000 |
| commit | 2edacca792ed00ed005e84afbbed9cb512c21778 (patch) | |
| tree | c1b4c5c368c1863dbf782b56407490480155c876 /sbin/fsck_ext2fs/utilities.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-2edacca792ed00ed005e84afbbed9cb512c21778.tar.xz wireguard-openbsd-2edacca792ed00ed005e84afbbed9cb512c21778.zip | |
Replace overlapping memcpy() with memmove() in getpathname().
Same fix as in fsck_ffs. OK deraadt@ tb@
Diffstat (limited to 'sbin/fsck_ext2fs/utilities.c')
| -rw-r--r-- | sbin/fsck_ext2fs/utilities.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/fsck_ext2fs/utilities.c b/sbin/fsck_ext2fs/utilities.c index ee2d01d9571..2a54c94e613 100644 --- a/sbin/fsck_ext2fs/utilities.c +++ b/sbin/fsck_ext2fs/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.27 2016/03/16 15:41:10 krw Exp $ */ +/* $OpenBSD: utilities.c,v 1.28 2019/02/06 16:21:27 millert Exp $ */ /* $NetBSD: utilities.c,v 1.6 2001/02/04 21:19:34 christos Exp $ */ /* @@ -417,7 +417,7 @@ getpathname(char *namebuf, size_t buflen, ino_t curdir, ino_t ino) break; len = strlen(namebuf); cp -= len; - memcpy(cp, namebuf, len); + memmove(cp, namebuf, len); *(--cp) = '/'; if (cp < &namebuf[EXT2FS_MAXNAMLEN]) break; @@ -426,7 +426,7 @@ getpathname(char *namebuf, size_t buflen, ino_t curdir, ino_t ino) busy = 0; if (ino != EXT2_ROOTINO) *(--cp) = '?'; - memcpy(namebuf, cp, (size_t)(&namebuf[buflen] - cp)); + memmove(namebuf, cp, (size_t)(&namebuf[buflen] - cp)); } /*ARGSUSED*/ |