diff options
| author | Daniel Scheller | 2017-08-12 13:56:00 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-08-20 13:08:53 +0200 |
| commit | fc3fb43e41a15a3508f919a825c186c6e5a22404 (patch) | |
| tree | bfe3d2d76a25dafac9ee2c80c2198911c81550ea /drivers/media/pci/ddbridge | |
| parent | media: ddbridge: fix impossible condition warning (diff) | |
| download | kernel-qcow2-linux-fc3fb43e41a15a3508f919a825c186c6e5a22404.tar.gz kernel-qcow2-linux-fc3fb43e41a15a3508f919a825c186c6e5a22404.tar.xz kernel-qcow2-linux-fc3fb43e41a15a3508f919a825c186c6e5a22404.zip | |
media: ddbridge: fix dereference before check
Both ts_release() and ts_open() can use "output" before check (smatch):
drivers/media/pci/ddbridge/ddbridge-core.c:816 ts_release() warn: variable dereferenced before check 'output' (see line 809)
drivers/media/pci/ddbridge/ddbridge-core.c:836 ts_open() warn: variable dereferenced before check 'output' (see line 828)
Fix by performing checks on those pointers.
Cc: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Tested-by: Richard Scobie <r.scobie@clear.net.nz>
Tested-by: Jasmin Jessich <jasmin@anw.at>
Tested-by: Dietmar Spingler <d_spingler@freenet.de>
Tested-by: Manfred Knick <Manfred.Knick@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/ddbridge')
| -rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-core.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index 66b520d131a0..e051a691eb42 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -738,8 +738,13 @@ static unsigned int ts_poll(struct file *file, poll_table *wait) static int ts_release(struct inode *inode, struct file *file) { struct dvb_device *dvbdev = file->private_data; - struct ddb_output *output = dvbdev->priv; - struct ddb_input *input = output->port->input[0]; + struct ddb_output *output = NULL; + struct ddb_input *input = NULL; + + if (dvbdev) { + output = dvbdev->priv; + input = output->port->input[0]; + } if ((file->f_flags & O_ACCMODE) == O_RDONLY) { if (!input) @@ -757,8 +762,13 @@ static int ts_open(struct inode *inode, struct file *file) { int err; struct dvb_device *dvbdev = file->private_data; - struct ddb_output *output = dvbdev->priv; - struct ddb_input *input = output->port->input[0]; + struct ddb_output *output = NULL; + struct ddb_input *input = NULL; + + if (dvbdev) { + output = dvbdev->priv; + input = output->port->input[0]; + } if ((file->f_flags & O_ACCMODE) == O_RDONLY) { if (!input) |