From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 100276 invoked by alias); 16 Oct 2017 11:00:28 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 100202 invoked by uid 89); 16 Oct 2017 11:00:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=Hx-languages-length:1621 X-Spam-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 11:00:25 +0000 Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id E0E0D3000B9C; Mon, 16 Oct 2017 13:00:21 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id A39594152C4B; Mon, 16 Oct 2017 13:00:21 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH] lib: sha1, md5, use memmove to move bytes inside buffer, not memcpy. Date: Mon, 16 Oct 2017 11:00:00 -0000 Message-Id: <1508151613-29280-1-git-send-email-mark@klomp.org> X-Mailer: git-send-email 1.8.3.1 X-Spam-Flag: NO X-IsSubscribed: yes X-SW-Source: 2017-q4/txt/msg00023.txt.bz2 At the end of {sha1,md5}_process_bytes we move the contents of ctx->buffer up to the start of the buffer. Since this means the source and destination overlap we should use memmove, not memcpy. Signed-off-by: Mark Wielaard --- lib/ChangeLog | 6 ++++++ lib/md5.c | 2 +- lib/sha1.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 6123045..2b91c3a 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2017-10-16 Mark Wielaard + + * md5.c (md5_process_bytes): Use memmove to move bytes inside buffer, + not memcpy. + * sha1.c (sha1_process_bytes): Likewise. + 2017-08-18 Ulf Hermann * eu-config.h: Define attribute_packed to either diff --git a/lib/md5.c b/lib/md5.c index 40f3044..d6f6302 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -263,7 +263,7 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) { md5_process_block (ctx->buffer, 64, ctx); left_over -= 64; - memcpy (ctx->buffer, &ctx->buffer[64], left_over); + memmove (ctx->buffer, &ctx->buffer[64], left_over); } ctx->buflen = left_over; } diff --git a/lib/sha1.c b/lib/sha1.c index 6a9b61f..da01610 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -182,7 +182,7 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) { sha1_process_block (ctx->buffer, 64, ctx); left_over -= 64; - memcpy (ctx->buffer, &ctx->buffer[64], left_over); + memmove (ctx->buffer, &ctx->buffer[64], left_over); } ctx->buflen = left_over; } -- 1.8.3.1