upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not access gmbus_ports array past its end.

Browse source 
Reported and tested by:	hselasky
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2015-02-03 13:43:03 +00:00
parent bf5fce2bee
commit 668259c84d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/dev/drm2/i915/intel_iic.c
View file

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