From patchwork Mon May 12 23:30:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 29997 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9998A203F3 for ; Mon, 12 May 2014 23:33:45 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hu19sf16216689vcb.4 for ; Mon, 12 May 2014 16:33:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=B7f1UrmDLQ1+q1hWH2Tx+WRyUpCJYHdu0UmywIxjOX8=; b=C29YzMFonOKOkLiWZaltxIrrhgKs4jLxVBggy1Ox+vm8kTHUajD2KR1UBR07t8kW88 DNCPYxcSBBnGxeZIL8YSbcaQQHhtaCbLFJyqXU2VUIDJUrueCIfU80DKcYgnt/mkdnIX Mkat5WhoX/+EsxiuJY2mK1p+wCFmalvWWHk7BNxK03LlUERt4jC2+RM7RdZIjvlAJaaP FZ+ETkSpQYBd59cyRfseJYd+vobgvXaqpCY6uY7Q5vHt/tziz6K1R6gvAKm+use0VWtC K5J6vQxRZ+BrThX2KNoyRPYJxxn2PlkLd7goItYr3URbIlZ6yfjt+zWC7S2oyxQnY0cK S+mA== X-Gm-Message-State: ALoCoQnDg9IL+aXD3Q2F6LQLU36SlEzhCsHMbCstPjVVWo8lP8mJ6oSecUGqzUrpS78+vjGXL1E9 X-Received: by 10.58.77.138 with SMTP id s10mr5851004vew.40.1399937625371; Mon, 12 May 2014 16:33:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.145 with SMTP id 17ls1565417qgn.21.gmail; Mon, 12 May 2014 16:33:45 -0700 (PDT) X-Received: by 10.58.216.34 with SMTP id on2mr25157724vec.22.1399937625244; Mon, 12 May 2014 16:33:45 -0700 (PDT) Received: from mail-ve0-x22e.google.com (mail-ve0-x22e.google.com [2607:f8b0:400c:c01::22e]) by mx.google.com with ESMTPS id tj4si2317998vdc.213.2014.05.12.16.33.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 12 May 2014 16:33:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22e as permitted sender) client-ip=2607:f8b0:400c:c01::22e; Received: by mail-ve0-f174.google.com with SMTP id jw12so9749249veb.33 for ; Mon, 12 May 2014 16:33:45 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr4399020vcb.28.1399937625157; Mon, 12 May 2014 16:33:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp106425vcb; Mon, 12 May 2014 16:33:44 -0700 (PDT) X-Received: by 10.140.104.16 with SMTP id z16mr40768359qge.76.1399937624401; Mon, 12 May 2014 16:33:44 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c3si1848025qab.153.2014.05.12.16.33.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 12 May 2014 16:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:40576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wjzj5-0005yK-MZ for patch@linaro.org; Mon, 12 May 2014 19:33:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjzhM-0004eP-Rq for qemu-devel@nongnu.org; Mon, 12 May 2014 19:32:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjzhI-0005m7-3N for qemu-devel@nongnu.org; Mon, 12 May 2014 19:31:56 -0400 Received: from mail-qg0-x236.google.com ([2607:f8b0:400d:c04::236]:64919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjzhH-0005m0-TK for qemu-devel@nongnu.org; Mon, 12 May 2014 19:31:51 -0400 Received: by mail-qg0-f54.google.com with SMTP id q108so8599775qgd.27 for ; Mon, 12 May 2014 16:31:51 -0700 (PDT) X-Received: by 10.229.27.198 with SMTP id j6mr42929833qcc.12.1399937511517; Mon, 12 May 2014 16:31:51 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id m7sm23815931qae.35.2014.05.12.16.31.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 16:31:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 12 May 2014 16:30:51 -0700 Message-Id: <1399937474-6530-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1399937474-6530-1-git-send-email-rth@twiddle.net> References: <1399937474-6530-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::236 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 03/26] tcg: Avoid undefined behaviour patching code at unaligned addresses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Original-Sender: rth@twiddle.net X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22e as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=fail header.i=@gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell To avoid C undefined behaviour when patching generated code, provide wrappers tcg_patch8/16/32/64 which use the usual memcpy trick, and use them in the i386 backend. Reviewed-by: Alex Bennée Signed-off-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c | 12 ++++++------ tcg/tcg.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 34ece1f..9a585ab 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -151,14 +151,14 @@ static void patch_reloc(uint8_t *code_ptr, int type, if (value != (int32_t)value) { tcg_abort(); } - *(uint32_t *)code_ptr = value; + tcg_patch32(code_ptr, value); break; case R_386_PC8: value -= (uintptr_t)code_ptr; if (value != (int8_t)value) { tcg_abort(); } - *(uint8_t *)code_ptr = value; + tcg_patch8(code_ptr, value); break; default: tcg_abort(); @@ -1276,9 +1276,9 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) uint8_t **label_ptr = &l->label_ptr[0]; /* resolve label address */ - *(uint32_t *)label_ptr[0] = (uint32_t)(s->code_ptr - label_ptr[0] - 4); + tcg_patch32(label_ptr[0], s->code_ptr - label_ptr[0] - 4); if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) { - *(uint32_t *)label_ptr[1] = (uint32_t)(s->code_ptr - label_ptr[1] - 4); + tcg_patch32(label_ptr[1], s->code_ptr - label_ptr[1] - 4); } if (TCG_TARGET_REG_BITS == 32) { @@ -1360,9 +1360,9 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) TCGReg retaddr; /* resolve label address */ - *(uint32_t *)label_ptr[0] = (uint32_t)(s->code_ptr - label_ptr[0] - 4); + tcg_patch32(label_ptr[0], s->code_ptr - label_ptr[0] - 4); if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) { - *(uint32_t *)label_ptr[1] = (uint32_t)(s->code_ptr - label_ptr[1] - 4); + tcg_patch32(label_ptr[1], s->code_ptr - label_ptr[1] - 4); } if (TCG_TARGET_REG_BITS == 32) { diff --git a/tcg/tcg.c b/tcg/tcg.c index 293f00b..31a5d48 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -122,6 +122,11 @@ static inline void tcg_out8(TCGContext *s, uint8_t v) *s->code_ptr++ = v; } +static inline void tcg_patch8(uint8_t *p, uint8_t v) +{ + memcpy(p, &v, sizeof(v)); +} + static inline void tcg_out16(TCGContext *s, uint16_t v) { uint8_t *p = s->code_ptr; @@ -129,6 +134,11 @@ static inline void tcg_out16(TCGContext *s, uint16_t v) s->code_ptr = p + 2; } +static inline void tcg_patch16(uint8_t *p, uint16_t v) +{ + memcpy(p, &v, sizeof(v)); +} + static inline void tcg_out32(TCGContext *s, uint32_t v) { uint8_t *p = s->code_ptr; @@ -136,6 +146,11 @@ static inline void tcg_out32(TCGContext *s, uint32_t v) s->code_ptr = p + 4; } +static inline void tcg_patch32(uint8_t *p, uint32_t v) +{ + memcpy(p, &v, sizeof(v)); +} + static inline void tcg_out64(TCGContext *s, uint64_t v) { uint8_t *p = s->code_ptr; @@ -143,6 +158,11 @@ static inline void tcg_out64(TCGContext *s, uint64_t v) s->code_ptr = p + 8; } +static inline void tcg_patch64(uint8_t *p, uint64_t v) +{ + memcpy(p, &v, sizeof(v)); +} + /* label relocation processing */ static void tcg_out_reloc(TCGContext *s, uint8_t *code_ptr, int type,