From patchwork Mon Apr 23 16:25:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 903016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q3R1WXxA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40VBj03qQlz9rxs for ; Tue, 24 Apr 2018 02:28:20 +1000 (AEST) Received: from localhost ([::1]:54372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAeKA-0000tY-Lk for incoming@patchwork.ozlabs.org; Mon, 23 Apr 2018 12:28:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAeHa-0007Hn-Pc for qemu-devel@nongnu.org; Mon, 23 Apr 2018 12:25:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAeHZ-0000rK-RJ for qemu-devel@nongnu.org; Mon, 23 Apr 2018 12:25:38 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAeHZ-0000rE-MQ for qemu-devel@nongnu.org; Mon, 23 Apr 2018 12:25:37 -0400 Received: by mail-qt0-x243.google.com with SMTP id f1-v6so1189137qtj.6 for ; Mon, 23 Apr 2018 09:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2D7TZqV4430a0dA8MCrQgXIuMRPdl1CXT9hUN9/aLiY=; b=q3R1WXxAozjz2Ijho3jyJVT6Dh1oJRZWFSgxvO9dMrrljmZz//NzWAGJ8gNjCyDQ91 cWogiBGgEDU/GgrttOO4acbuG0EzTQ7ylFXfsM31rASK4dd0p9fO1h44Of4sS7Dsa4tA 3uk2Fbt+bReDBmX5DujZdrBVnNP6lwk7kRdUjipjkevmttp8UBZesOKp7zpTwDC5ivBB zSgw8I5aZwvn0FaSI19lIRQjL3ryFadBWAQGQWKYgR+ryebsmw4FE98+tMMp3WalZE21 /ZL1TqHajpFcTVdqj167mjlUchuBF4z2nCIirwdoA+RVl3HIo/SkMV8qtZFjVNEZC4Ib +mVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2D7TZqV4430a0dA8MCrQgXIuMRPdl1CXT9hUN9/aLiY=; b=ssV3Rb0He+hMdlTWzemCWPAqhFWRe66KFQbrlbuqt0CKI+xHcRXAF+oEKcGz3539WN D8SjFGTyxC9iOkIELQaviWK9WsateHt5uX3ErSE+0v8rxnUA11oVp6a6PDk5vZOwj31x ZLYSbltIqLje+zYq4ZLLOU8l2oITi0Wmqh7zMpd/V2XXJHS0/Fr2Nc1Oyw8c7zTVAtX6 lajLlA6kOvzNDmXp/ug2BUhCAp+aV0YFOBICuGNKCeQUYculPIO7YQGTSlk8nCR0OwQy q0kialb5zl9qN3OFiEVHj+R3AQdcsjh2MgNkjm9UL/oavglSFa8fJ5efkPui+I18MlLe y2xA== X-Gm-Message-State: ALQs6tCHvW8GLfbhnZ8YAA7xmyvMmXO5DGgIfkGib9bewIIA2D4DCgj2 q1wS67yeljQrHjgSHkuEhg0= X-Google-Smtp-Source: AIpwx483QPLIB6FlVdwhCvD/M5e+mA3G4KD+adKnl6zTV5bbGQlei/ie7fe4sAG4VXRb3xUtWmeQSg== X-Received: by 2002:aed:2962:: with SMTP id s89-v6mr23412831qtd.162.1524500737189; Mon, 23 Apr 2018 09:25:37 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d188sm4108889qkb.9.2018.04.23.09.25.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 09:25:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: David Gibson , Peter Maydell Date: Mon, 23 Apr 2018 13:25:23 -0300 Message-Id: <20180423162523.6392-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423162523.6392-1-f4bug@amsat.org> References: <20180423162523.6392-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 2/2] loader: Fix 64-bit misaligned member access X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paul Burton , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The libfdt does not guarantee than fdt_getprop() returns a pointer aligned to the property size. Assuming the base of the fdt is aligned, a 32-bit property returns a 32-bit aligned pointer. This is however not guaranteed for 64-bit properties, where 64-bit loads might trigger unaligned access. Fix this issue by using the ldst (host) API, which does a local copy on the stack, thus guaranteeing a safe aligned access. This fixes the following ASan warning: $ mips64el-softmmu/qemu-system-mips64el -M boston -kernel vmlinux.gz.itb -nographic hw/core/loader-fit.c:108:17: runtime error: load of misaligned address 0x7f95cd7e4264 for type 'fdt64_t', which requires 8 byte alignment 0x7f95cd7e4264: note: pointer points here 00 00 00 3e ff ff ff ff 80 7d 2a c0 00 00 00 01 68 61 73 68 40 30 00 00 00 00 00 03 00 00 00 14 ^ Reported-by: AddressSanitizer Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paolo Bonzini --- hw/core/loader-fit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 0c4a7207f4..628f854636 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -102,10 +102,10 @@ static int fit_image_addr(const void *itb, int img, const char *name, switch (len) { case 4: - *addr = fdt32_to_cpu(*(fdt32_t *)prop); + *addr = fdt32_to_cpu(ldl_he_p(prop)); return 0; case 8: - *addr = fdt64_to_cpu(*(fdt64_t *)prop); + *addr = fdt64_to_cpu(ldq_he_p(prop)); return 0; default: error_printf("invalid %s address length %d\n", name, len);