From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:51935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1ROx26-0002Gg-Sx
	for qemu-devel@nongnu.org; Fri, 11 Nov 2011 14:45:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1ROx25-0001jE-LC
	for qemu-devel@nongnu.org; Fri, 11 Nov 2011 14:45:02 -0500
Received: from mail-iy0-f173.google.com ([209.85.210.173]:35059)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1ROx25-0001is-Gw
	for qemu-devel@nongnu.org; Fri, 11 Nov 2011 14:45:01 -0500
Received: by iakk32 with SMTP id k32so5202243iak.4
	for <qemu-devel@nongnu.org>; Fri, 11 Nov 2011 11:45:00 -0800 (PST)
Message-ID: <4EBD7B38.2000501@codemonkey.ws>
Date: Fri, 11 Nov 2011 13:44:56 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1320864338-9702-1-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1320864338-9702-1-git-send-email-peter.maydell@linaro.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] hw/omap_intc.c: Avoid crash on access to
 nonexistent banked registers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, patches@linaro.org

On 11/09/2011 12:45 PM, Peter Maydell wrote:
> 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<peter.maydell@linaro.org>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   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;
>           }
>       }
>