From patchwork Wed Nov 9 18:45:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 124656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C22F1B6F89 for ; Thu, 10 Nov 2011 05:45:57 +1100 (EST) Received: from localhost ([::1]:37704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROD9g-0006Wi-Hs for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2011 13:45:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:36713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROD9b-0006Wd-Bb for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:45:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROD9a-0005qm-7K for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:45:43 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:58840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROD9Z-0005qU-Vq for qemu-devel@nongnu.org; Wed, 09 Nov 2011 13:45:42 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1ROD9W-0002Wv-K2; Wed, 09 Nov 2011 18:45:38 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 9 Nov 2011 18:45:38 +0000 Message-Id: <1320864338-9702-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH] hw/omap_intc.c: Avoid crash on access to nonexistent banked registers 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Avoid a crash due to null pointer dereference if a guest attempts to access banked registers for a nonexistent bank. Spotted by Coverity (see bug 887883). Signed-off-by: Peter Maydell --- hw/omap_intc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/omap_intc.c b/hw/omap_intc.c index 0f7fd9d..45efa25 100644 --- a/hw/omap_intc.c +++ b/hw/omap_intc.c @@ -398,6 +398,9 @@ static uint64_t omap2_inth_read(void *opaque, target_phys_addr_t addr, if (bank_no < s->nbanks) { offset &= ~0x60; bank = &s->bank[bank_no]; + } else { + OMAP_BAD_REG(addr); + return 0; } } @@ -476,6 +479,9 @@ static void omap2_inth_write(void *opaque, target_phys_addr_t addr, if (bank_no < s->nbanks) { offset &= ~0x60; bank = &s->bank[bank_no]; + } else { + OMAP_BAD_REG(addr); + return; } }