From patchwork Tue Nov 13 12:40:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 997075 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42vRzk05Cyz9sBZ; Tue, 13 Nov 2018 23:40:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gMXzL-0002S8-Bb; Tue, 13 Nov 2018 12:40:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gMXzK-0002S1-8m for fwts-devel@lists.ubuntu.com; Tue, 13 Nov 2018 12:40:14 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gMXzJ-0005q0-Ux; Tue, 13 Nov 2018 12:40:14 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_coreboot_cbmem: don't use void * pointer arithmetic Date: Tue, 13 Nov 2018 12:40:13 +0000 Message-Id: <20181113124013.16537-1-colin.king@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King void * pointer arithmetic is a GCC'ism and the behaviour is undefined, so use char * pointer arithmetic instead. Cleans up clang warnings. Signed-off-by: Colin Ian King --- src/lib/src/fwts_coreboot_cbmem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/src/fwts_coreboot_cbmem.c b/src/lib/src/fwts_coreboot_cbmem.c index 53e57136..e02c523c 100644 --- a/src/lib/src/fwts_coreboot_cbmem.c +++ b/src/lib/src/fwts_coreboot_cbmem.c @@ -144,11 +144,11 @@ static int parse_cbtable_entries( off_t *cbmem_console_addr) { size_t i; - const struct lb_record* lbr_p; int forwarding_table_found = 0; + const struct lb_record *lbr_p; for (i = 0; i < table_size; i += lbr_p->size) { - lbr_p = lbtable + i; + lbr_p = (struct lb_record*)((char *)lbtable + i); switch (lbr_p->tag) { case LB_TAG_CBMEM_CONSOLE: { *cbmem_console_addr = (off_t)parse_cbmem_ref((const struct lb_cbmem_ref *) lbr_p).cbmem_addr; @@ -205,11 +205,9 @@ static int parse_cbtable( /* look at every 16 bytes */ for (i = 0; i <= req_size - sizeof(struct lb_header); i += 16) { int ret; - const struct lb_header *lbh; + const struct lb_header *lbh = (struct lb_header *)((char *)buf + i); void *map; - lbh = buf + i; - if (memcmp(lbh->signature, "LBIO", sizeof(lbh->signature)) || !lbh->header_bytes || ipchcksum(lbh, sizeof(*lbh))) { @@ -262,7 +260,7 @@ static ssize_t memory_read_from_buffer( if (count > available - pos) count = available - pos; - memcpy(to, from + pos, count); + memcpy(to, (char *)from + pos, count); *ppos = pos + count;