diff options
author | kib <kib@FreeBSD.org> | 2015-02-03 13:43:03 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2015-02-03 13:43:03 +0000 |
commit | 40fc5bfda9ade061366cc77a60c1aecf6a08ad4d (patch) | |
tree | 3cece5fb5c935962da16b02c54f8a3433f6712fd /sys/dev/drm2 | |
parent | 09bdd8a7f8d60c0459d4ea8d861c168d8310a3e8 (diff) | |
download | FreeBSD-src-40fc5bfda9ade061366cc77a60c1aecf6a08ad4d.zip FreeBSD-src-40fc5bfda9ade061366cc77a60c1aecf6a08ad4d.tar.gz |
Do not access gmbus_ports array past its end.
Reported and tested by: hselasky
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/dev/drm2')
-rw-r--r-- | sys/dev/drm2/i915/intel_iic.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/drm2/i915/intel_iic.c b/sys/dev/drm2/i915/intel_iic.c index fdd59e5..aa12a78 100644 --- a/sys/dev/drm2/i915/intel_iic.c +++ b/sys/dev/drm2/i915/intel_iic.c @@ -556,7 +556,9 @@ intel_gmbus_attach(device_t idev) pin = device_get_unit(idev); port = pin + 1; - snprintf(sc->name, sizeof(sc->name), "gmbus %s", gmbus_ports[pin].name); + snprintf(sc->name, sizeof(sc->name), "gmbus %s", + intel_gmbus_is_port_valid(port) ? gmbus_ports[pin].name : + "reserved"); device_set_desc(idev, sc->name); /* By default use a conservative clock rate */ @@ -613,17 +615,21 @@ intel_iicbb_attach(device_t idev) { struct intel_iic_softc *sc; struct drm_i915_private *dev_priv; - int pin; + int pin, port; sc = device_get_softc(idev); sc->drm_dev = device_get_softc(device_get_parent(idev)); dev_priv = sc->drm_dev->dev_private; pin = device_get_unit(idev); + port = pin + 1; snprintf(sc->name, sizeof(sc->name), "i915 iicbb %s", - gmbus_ports[pin].name); + intel_gmbus_is_port_valid(port) ? gmbus_ports[pin].name : + "reserved"); device_set_desc(idev, sc->name); + if (!intel_gmbus_is_port_valid(port)) + pin = 1 ; /* GPIOA, VGA */ sc->reg0 = pin | GMBUS_RATE_100KHZ; sc->reg = dev_priv->gpio_mmio_base + gmbus_ports[pin].reg; |