From patchwork Wed Sep 12 05:17:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 968845 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JnyMMUhp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4299CK4ryFz9s3Z for ; Wed, 12 Sep 2018 15:22:35 +1000 (AEST) Received: from localhost ([::1]:34283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzxbf-00041g-8s for incoming@patchwork.ozlabs.org; Wed, 12 Sep 2018 01:22:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzxaj-0003jq-M1 for qemu-devel@nongnu.org; Wed, 12 Sep 2018 01:21:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzxXA-0007dg-Nn for qemu-devel@nongnu.org; Wed, 12 Sep 2018 01:17:52 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:37806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fzxXA-0007dU-HR for qemu-devel@nongnu.org; Wed, 12 Sep 2018 01:17:48 -0400 Received: by mail-pg1-x541.google.com with SMTP id 2-v6so414743pgo.4 for ; Tue, 11 Sep 2018 22:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=AmiU/k7SJ47YeT0sFQwqzJpfWCAlvd2nKzpf7OwB0LU=; b=JnyMMUhpjxCuiJ5E5w8c3kWqBcBSoPOxjfBTWGqQ326UfeyakoIGMt8YLNgxI0F79/ ANYPhn9H8Gf4/b9LXpkCMHUygLC01Doc4h6QrvcqMXRwYMwa93kuufBJQuhgc7xgYCPq dw0kb00eA4LXuWPJZyWB0OBtCnZRCCIkcKmM/MZzKQQksHCbBW7gJs7DfPJq0j3F7TWY pDzmw87pEbybTdbpnj2CexG82ymRyQdQNrqP0jTo3aMcVbAheOzw0jg72H4aQ799PDa5 e1jPReqqkOl8CpsMKcxKSfzbV0fpJQyWgo0JxKVtt5fQ8dLXZeSTaeKysj43WwI6UGlX uwNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AmiU/k7SJ47YeT0sFQwqzJpfWCAlvd2nKzpf7OwB0LU=; b=prl/IRHjLnI/Uu5zmxJJT1fleo2xnYruUhn2LwdCdXaYcamJ1RwQGUi9RL8MS1HL1B LlRQwina7r7EgLEKwO6piC6goNEWfc+v1nwJ5VZJoMgitOOkPjjErX7ri5NXkEq3CMeL 2v6Yv8XGY9gEdxYIdv2Gr9j0+43WD0c0Xe+NkfPi4W5dZ4xSQtPojLvK2BQcIfOUWWDe di8D73NxVGv7E3BzKL3cDlTPbV2iS04Ne+gdpWBe3gMGapfv2tv6W5sbKHhaWdmixJzw tBmUTC/kOrisuJWEjV35ul6ZOFCsqM9Bj78/BL1VxeSQvbSbnlzpaVFLqESLvlpmVypH XleA== X-Gm-Message-State: APzg51CEs3X3pNsRVjjkQ38j5Z3qx1Y17d7jY2FL4wAyciwyhXnSpoK0 H3mukYz+oT5XA9umqIyyfQ4= X-Google-Smtp-Source: ANB0VdY4uuShVDtl59z22TD671CR+9uDILw5QYnEcghM3A76fy7VjB/FQcPFNJpaYGQ5afEFX4tqig== X-Received: by 2002:a63:a441:: with SMTP id c1-v6mr164069pgp.182.1536729467584; Tue, 11 Sep 2018 22:17:47 -0700 (PDT) Received: from localhost.localdomain.localdomain ([103.65.40.65]) by smtp.gmail.com with ESMTPSA id h10-v6sm40797851pfj.78.2018.09.11.22.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 22:17:47 -0700 (PDT) From: Li Qiang To: mst@redhat.com, ehabkost@redhat.com, lersek@redhat.com, peter.maydell@linaro.org, richard.henderson@linaro.org Date: Tue, 11 Sep 2018 22:17:41 -0700 Message-Id: <1536729461-2692-1-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH] fw_cfg_mem: add read memory region callback 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The write/read should be paired, this can avoid the NULL-deref while the guest reads the fw_cfg port. Signed-off-by: Li Qiang --- hw/nvram/fw_cfg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index d79a568f54..6de7809f1a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -434,6 +434,11 @@ static bool fw_cfg_data_mem_valid(void *opaque, hwaddr addr, return addr == 0; } +static uint64_t fw_cfg_ctl_mem_read(void *opaque, hwaddr addr, unsigned size) +{ + return 0; +} + static void fw_cfg_ctl_mem_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { @@ -468,6 +473,7 @@ static bool fw_cfg_comb_valid(void *opaque, hwaddr addr, } static const MemoryRegionOps fw_cfg_ctl_mem_ops = { + .read = fw_cfg_ctl_mem_read, .write = fw_cfg_ctl_mem_write, .endianness = DEVICE_BIG_ENDIAN, .valid.accepts = fw_cfg_ctl_mem_valid,