Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754628AbbGUNtE (ORCPT ); Tue, 21 Jul 2015 09:49:04 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36014 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbbGUNtD (ORCPT ); Tue, 21 Jul 2015 09:49:03 -0400 Date: Tue, 21 Jul 2015 15:51:40 +0200 From: Daniel Vetter To: Sudip Mukherjee Cc: Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH v3 1/2] drm/i915: remove unnecessary null test Message-ID: <20150721135140.GM16722@phenom.ffwll.local> Mail-Followup-To: Sudip Mukherjee , Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <1437480406-19285-1-git-send-email-sudipm.mukherjee@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437480406-19285-1-git-send-email-sudipm.mukherjee@gmail.com> X-Operating-System: Linux phenom 4.2.0-rc1+ User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3428 Lines: 107 On Tue, Jul 21, 2015 at 05:36:45PM +0530, Sudip Mukherjee wrote: > While creating the debugfs file we are setting the inode->i_private to > dev. That same dev is passed to these functions as private of struct > seq_file via single_open(). Moreover single_open is setting > file->private_data->private to dev. > So at this point it can never be NULL. > This check was added by commit eb3394faeb97 ("drm/i915: Add debugfs test > control files for Displayport compliance testing") > Still missing Cc: Chris Wilson ... Cc: Todd Previte ... here to make sure reviewers/original authors are in the loop. Anyway this is a simple enough patch, so I just pulled them both in. Thanks, Daniel > Signed-off-by: Sudip Mukherjee > --- > > v3: removed the check in i915_displayport_test_active_write also > v2: removed null check > v1 was drm/i915: fix possible null pointer dereference > > drivers/gpu/drm/i915/i915_debugfs.c | 21 +-------------------- > 1 file changed, 1 insertion(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index bc817da..ffce62e 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -4028,24 +4028,14 @@ static ssize_t i915_displayport_test_active_write(struct file *file, > { > char *input_buffer; > int status = 0; > - struct seq_file *m; > struct drm_device *dev; > struct drm_connector *connector; > struct list_head *connector_list; > struct intel_dp *intel_dp; > int val = 0; > > - m = file->private_data; > - if (!m) { > - status = -ENODEV; > - return status; > - } > - dev = m->private; > + dev = ((struct seq_file *)file->private_data)->private; > > - if (!dev) { > - status = -ENODEV; > - return status; > - } > connector_list = &dev->mode_config.connector_list; > > if (len == 0) > @@ -4103,9 +4093,6 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data) > struct list_head *connector_list = &dev->mode_config.connector_list; > struct intel_dp *intel_dp; > > - if (!dev) > - return -ENODEV; > - > list_for_each_entry(connector, connector_list, head) { > > if (connector->connector_type != > @@ -4150,9 +4137,6 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data) > struct list_head *connector_list = &dev->mode_config.connector_list; > struct intel_dp *intel_dp; > > - if (!dev) > - return -ENODEV; > - > list_for_each_entry(connector, connector_list, head) { > > if (connector->connector_type != > @@ -4192,9 +4176,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) > struct list_head *connector_list = &dev->mode_config.connector_list; > struct intel_dp *intel_dp; > > - if (!dev) > - return -ENODEV; > - > list_for_each_entry(connector, connector_list, head) { > > if (connector->connector_type != > -- > 1.8.1.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/