Module Name: src
Committed By: jakllsch
Date: Fri Nov 13 18:52:16 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_pcie.c
Log Message:
validate emulated bus 0 configuration space access more carefully
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_pcie.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.5 src/sys/arch/arm/nvidia/tegra_pcie.c:1.6
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.5 Fri Nov 13 18:23:17 2015
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Fri Nov 13 18:52:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.5 2015/11/13 18:23:17 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.6 2015/11/13 18:52:16 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.5 2015/11/13 18:23:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.6 2015/11/13 18:52:16 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -329,6 +329,8 @@ tegra_pcie_conf_read(void *v, pcitag_t t
tegra_pcie_decompose_tag(v, tag, &b, &d, &f);
if (b == 0) {
+ if (d >= 2 || f != 0)
+ return (pcireg_t) -1;
reg = d * 0x1000 + offset;
bsh = sc->sc_bsh_a1;
} else {
@@ -353,6 +355,8 @@ tegra_pcie_conf_write(void *v, pcitag_t
tegra_pcie_decompose_tag(v, tag, &b, &d, &f);
if (b == 0) {
+ if (d >= 2 || f != 0)
+ return;
reg = d * 0x1000 + offset;
bsh = sc->sc_bsh_a1;
} else {
