2006-05-25 01:16:33

by Florin Malita

Subject: [PATCH] PCMCIA: missing pcmcia_get_socket() result check

The result of pcmcia_get_socket() may be NULL but ds_event() uses it
without checking.

Coverity CID: 436.

Signed-off-by: Florin Malita <[email protected]>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 48d3b3d..74b3124 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1143,6 +1143,12 @@ static int ds_event(struct pcmcia_socket
{
struct pcmcia_socket *s = pcmcia_get_socket(skt);

+ if (!s) {
+ printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \
+ "failed, event 0x%x lost!\n", skt, event);
+ return -ENODEV;
+ }
+
ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",
event, priority, skt);

2006-05-30 16:21:37

by Dominik Brodowski

Subject: Re: [PATCH] PCMCIA: missing pcmcia_get_socket() result check

Hi,

On Wed, May 24, 2006 at 09:21:31PM -0400, Florin Malita wrote:
> The result of pcmcia_get_socket() may be NULL but ds_event() uses it
> without checking.

Applied, thanks.

Dominik