From patchwork Mon May 23 15:09:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9132057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DEAAB607D5 for ; Mon, 23 May 2016 15:28:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5D3D2821B for ; Mon, 23 May 2016 15:28:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C98A728239; Mon, 23 May 2016 15:28:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 719B62821B for ; Mon, 23 May 2016 15:28:39 +0000 (UTC) Received: from localhost ([::1]:48890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rmY-0001WJ-Ic for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 May 2016 11:28:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rUs-0002Fj-Pd for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4rUq-00047t-SQ for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:21 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rUp-00047W-UJ for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:20 -0400 Received: by mail-wm0-x243.google.com with SMTP id n129so16052832wmn.1 for ; Mon, 23 May 2016 08:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YbyVN/HehsFE1Nc+dYuGsRwTPbhDTuAanX2uZERpVho=; b=OR3Jy4rsM1vmqjDw5PKjoWDtmP4rKUbsmCS/VvDyF2r/aesG/lfwJ2bgqokyueUKFL FW86+1do1aFOSi/oLmgWGgdaMv4NbYiHQmloZXJii4mVGGpIuz0ATEwO64ZBwO1ABvOh g9UuFBDEcoWFIo5rcf+nLRfPVZP9WQhlhuKwm4REgmGcr6KaNxzE2CCf25jpV4InTcY0 1Obxk2Ugs6LF5hMYYxDMuknxRb6M6n8m3qp3tHM69DKwZLasBbXhlXot+c0wT6md01v1 5pHcN4o2Lgq2TzXDsQ9NQKuieoy1iFQlwYpzX1mSQzkMPQV3iUY07bqpeekmjr9VF7uc is3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=YbyVN/HehsFE1Nc+dYuGsRwTPbhDTuAanX2uZERpVho=; b=BXNM6yFFnpGEEP4kkm3uMLc3V60Dwv2IXNqX7Oap3oH5j3ZUtKwmV/WqxvNj8FYoa8 ytyhBza33Iy7Vvq9ci8je9hBEDHwcAWvTLGEgmKXCTglEQ7m8do87m6EkUWXqbgt9fGr oQMEEZMDburdR1iW4zfCL+t3AlZ1/9MYmg+2knzqHLFATuv7JIAyEgaK6bZT+y2Dr3Ws +OCEpgpeggursnXRp7byP1bDW5ocSLVKXLDLDjksyuzuwAYk7ATuQXw2lrIOdBMK9zZn mDQeCmOceSM9xcStpZ15nTogHssVcbWPW0ioU0p5+wEDAyH/zsYW/wbiqMreLtpRhoVw ZYgQ== X-Gm-Message-State: AOPr4FVUzEXwzJ6Q2FMtQMT4RrfzbKrQa0bHzYdHWnjCVlY2rEhmNM8HHeWsvb7dw31rYg== X-Received: by 10.28.25.69 with SMTP id 66mr17270658wmz.39.1464016219431; Mon, 23 May 2016 08:10:19 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id ac2sm19250359wjc.35.2016.05.23.08.10.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2016 08:10:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 23 May 2016 17:09:52 +0200 Message-Id: <1464016199-43768-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> References: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 17/24] scripts/signrom.py: Check for magic in option ROMs. 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: "Richard W.M. Jones" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Richard W.M. Jones" Because of the risk that compilers might not emit the asm() block at the beginning of the option ROM, check that the ROM contains the required magic signature. Signed-off-by: Richard W.M. Jones Message-Id: <1463000807-18015-3-git-send-email-rjones@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/signrom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/signrom.py b/scripts/signrom.py index 6c8b9bf..5629bca 100644 --- a/scripts/signrom.py +++ b/scripts/signrom.py @@ -17,7 +17,10 @@ if len(sys.argv) < 3: fin = open(sys.argv[1], 'rb') fout = open(sys.argv[2], 'wb') -fin.seek(2) +magic = fin.read(2) +if magic != '\x55\xaa': + sys.exit("%s: option ROM does not begin with magic 55 aa" % sys.argv[1]) + size_byte = ord(fin.read(1)) fin.seek(0)