From patchwork Sat Jul 29 11:28:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 9869901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4840B6038F for ; Sat, 29 Jul 2017 11:30:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42C7E2889B for ; Sat, 29 Jul 2017 11:30:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 365C2288B5; Sat, 29 Jul 2017 11:30:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D647288D7 for ; Sat, 29 Jul 2017 11:30:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbdG2L3M (ORCPT ); Sat, 29 Jul 2017 07:29:12 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34805 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753745AbdG2L3F (ORCPT ); Sat, 29 Jul 2017 07:29:05 -0400 Received: by mail-wm0-f65.google.com with SMTP id x64so5864350wmg.1 for ; Sat, 29 Jul 2017 04:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jw/NiRLwAyXaJVDgrNfUyxQGOi56KySMeHz7U2IrUaY=; b=Q55UjJvDLRCjr3R2faZOc5Kn7W6RYPm8t7znetPH3XnzJjFK55tjFxTTFlXju1qe3u A+4/g48YkOTqwQ5RG3oJIeuuL5f4E1Rc+y2R5tmnx+FtPMu5MLO8f0n2P+W7i7pfXDO4 AlmEl5ACOcR2t8zNBm7wNoX4sK1ZjKvB8FG3KL9MCTet5ramDLs7NL6nTJ80kGYWYKVv rBSrevbZB1bIRriUaZg6i2AuJd9ON1ojRTHg7SxM6ypMkHssCTru8jCGLDk8b2M55qGr l/dMpHAytaROTyqhARJWrEgEnFEb5eudzJQccV6OvLANiQq1nU+aOpP9VMkPGX7AfhGV 6xcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jw/NiRLwAyXaJVDgrNfUyxQGOi56KySMeHz7U2IrUaY=; b=hPkWAzKkf4o4Bb/Qkz7s4Md+P7ClYZNzIAXgZrbxkdH+OUJpQ0zmA0qhFJ+zlcjw7K vYnujnhzNeHRBB2MVvQVpKlwqd7l+34bUCpdz/nBZdWfbvKCn1QtjLqhpY/kfeAjll2n ddSt0NgSM6j6Nmg+l9VSyOjvLg6FQ86VrG/WQt0uCzQDRdawKRc1RILH0AOJItjDz5Un ndqwpIt4EQLKpz0J0zMSHt17s3pA70iQuWuMJT6O7x/6zsa2+Mu6V540ZfFvdfiBmWwI qcEmMMTW2lRplio7DksqW/sVUaUlEZxCOFvu5Ps4EL53WTN+CHS4KGPD7UJWFtJ8bczG gcYQ== X-Gm-Message-State: AIVw113PO6/FAdyxXLVms/h+pLmEzScRn5mhUdqq7uieMaoCeqJze0RQ +xfyCkoR9BKUxcYb X-Received: by 10.28.169.82 with SMTP id s79mr8280278wme.123.1501327743950; Sat, 29 Jul 2017 04:29:03 -0700 (PDT) Received: from dvbdev.wuest.de (ip-84-118-193-88.unity-media.net. [84.118.193.88]) by smtp.gmail.com with ESMTPSA id o68sm6220054wmi.21.2017.07.29.04.29.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Jul 2017 04:29:03 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Cc: r.scobie@clear.net.nz, jasmin@anw.at, d_spingler@freenet.de, Manfred.Knick@t-online.de, rjkm@metzlerbros.de Subject: [PATCH v2 12/14] [media] ddbridge: fix dereference before check Date: Sat, 29 Jul 2017 13:28:46 +0200 Message-Id: <20170729112848.707-13-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170729112848.707-1-d.scheller.oss@gmail.com> References: <20170729112848.707-1-d.scheller.oss@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Scheller 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 Signed-off-by: Daniel Scheller Tested-by: Richard Scobie Tested-by: Jasmin Jessich Tested-by: Dietmar Spingler Tested-by: Manfred Knick --- drivers/media/pci/ddbridge/ddbridge-core.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index ace06fcdd0cf..ed75c1c6734a 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)