* [PATCH][Resend] viacam: Don't explode if pci_find_bus() returns NULL
@ 2011-08-01 21:39 Jesper Juhl
2011-09-15 12:59 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Jesper Juhl @ 2011-08-01 21:39 UTC (permalink / raw)
To: linux-kernel; +Cc: trivial, Jonathan Corbet, linux-media, Mauro Carvalho Chehab
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>
---
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 85d3048..bb7f17f 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)
--
1.7.6
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][Resend] viacam: Don't explode if pci_find_bus() returns NULL
2011-08-01 21:39 [PATCH][Resend] viacam: Don't explode if pci_find_bus() returns NULL Jesper Juhl
@ 2011-09-15 12:59 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2011-09-15 12:59 UTC (permalink / raw)
To: Jesper Juhl
Cc: linux-kernel, Jonathan Corbet, linux-media, Mauro Carvalho Chehab
On Mon, 1 Aug 2011, Jesper Juhl wrote:
> 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>
> ---
> 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 85d3048..bb7f17f 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)
Applied, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-15 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-01 21:39 [PATCH][Resend] viacam: Don't explode if pci_find_bus() returns NULL Jesper Juhl
2011-09-15 12:59 ` Jiri Kosina
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.