diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2011-08-01 18:39:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-11 09:33:39 -0300 |
| commit | c8814df3a578895390fe5c05a76328d8d111ed25 (patch) | |
| tree | 477fffed67481d0c1b626f9a2e5af3f4655378ee /drivers | |
| parent | 6a02a3306769c6f0fa8ebd92d5046c841e4e740d (diff) | |
| download | linux-stable-c8814df3a578895390fe5c05a76328d8d111ed25.tar.gz linux-stable-c8814df3a578895390fe5c05a76328d8d111ed25.tar.bz2 linux-stable-c8814df3a578895390fe5c05a76328d8d111ed25.zip | |
[media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL
In the unlikely case that pci_find_bus() should return NULL
viacam_serial_is_enabled() is going to dereference a NULL pointer and
blow up. Better safe than sorry, so be defensive and check the
pointer.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/via-camera.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index 85d3048c1d67..bb7f17f2a33c 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c @@ -1332,6 +1332,8 @@ static __devinit bool viacam_serial_is_enabled(void) struct pci_bus *pbus = pci_find_bus(0, 0); u8 cbyte; + if (!pbus) + return false; pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN, VIACAM_SERIAL_CREG, &cbyte); if ((cbyte & VIACAM_SERIAL_BIT) == 0) |