From 0f58fbd95e0048feea002c90182dc188f0dfc07c Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 18 Dec 2011 10:17:48 +0800 Subject: [PATCH] nexus/intr: Properly assert cpuid for interrupt resources Noticed-by: Nuno Antunes --- sys/platform/pc32/i386/nexus.c | 2 +- sys/platform/pc64/x86_64/nexus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index 92cb4a5..0135d5b 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -355,7 +355,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - KASSERT(cpuid >= 0 || cpuid < ncpus, + KASSERT(cpuid >= 0 && cpuid < ncpus, ("nexus invalid cpuid %d:\n", cpuid)); rm = &irq_rman[cpuid]; break; diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c index 156b9b6..020f30f 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -351,7 +351,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - KASSERT(cpuid >= 0 || cpuid < ncpus, + KASSERT(cpuid >= 0 && cpuid < ncpus, ("nexus invalid cpuid %d:\n", cpuid)); rm = &irq_rman[cpuid]; break; -- 1.7.7.2