From patchwork Wed Apr 2 02:08:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fariyaf@gmail.com X-Patchwork-Id: 3926331 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 15A4A9F2B6 for ; Wed, 2 Apr 2014 02:08:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4904E20268 for ; Wed, 2 Apr 2014 02:08:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76A9A20266 for ; Wed, 2 Apr 2014 02:08:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757389AbaDBCIR (ORCPT ); Tue, 1 Apr 2014 22:08:17 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:37859 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756889AbaDBCIQ (ORCPT ); Tue, 1 Apr 2014 22:08:16 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so10792598pbb.33 for ; Tue, 01 Apr 2014 19:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6AkPiFOAAoSDKJ9uJcwcLKEGu7Y37scUcCXkK7bCg1w=; b=DpT1JSDtDLEQOKghYdQABsMI6aL5QihxqYdBI4QDklEVSiVZuixNcT4NDNki2b7eK1 Mt6fPEgi/7iOL0bPH/RN6bf4ef/wc/L8h7LdCd8Dq3SgvO00ZE8md08tz3RlGn5njgPU DSJhOBtECLpbxBBh077PNlxc7jCHzPRqsyKvv6iw5GGY9TGwg9EuoZQ1hAReKLBWVzEV CRxY1JlZ3GlkTgiZMmF1kI6ake8HH5rTENMSD8YhZ7QBA7zV8iEuJk9+4PX5if1EVtGN WTt2DSG8Eo8VMWL4J2PdWFqtaAauyiCnC24C5zZzdzbIVGEMB8wgUdaxa9tnhW0XBkVJ Jbug== X-Received: by 10.66.144.102 with SMTP id sl6mr34088075pab.96.1396404495975; Tue, 01 Apr 2014 19:08:15 -0700 (PDT) Received: from localhost.localdomain ([27.6.128.194]) by mx.google.com with ESMTPSA id dn1sm709612pbb.54.2014.04.01.19.08.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 19:08:15 -0700 (PDT) From: Fariya Fatima To: linux-wireless@vger.kernel.org Cc: Fariya Fatima Subject: [PATCH 1/6] rsi: Potential null pointer derefernce issue fixed. Date: Wed, 2 Apr 2014 07:38:00 +0530 Message-Id: <1396404485-3989-2-git-send-email-fariyaf@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1396404485-3989-1-git-send-email-fariyaf@gmail.com> References: <1396404485-3989-1-git-send-email-fariyaf@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fariya Fatima Signed-off-by: Fariya Fatima --- drivers/net/wireless/rsi/rsi_91x_debugfs.c | 35 ++++++++++++--------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_debugfs.c b/drivers/net/wireless/rsi/rsi_91x_debugfs.c index 7e4ef45..c466246 100644 --- a/drivers/net/wireless/rsi/rsi_91x_debugfs.c +++ b/drivers/net/wireless/rsi/rsi_91x_debugfs.c @@ -289,32 +289,29 @@ int rsi_init_dbgfs(struct rsi_hw *adapter) const struct rsi_dbg_files *files; dev_dbgfs = kzalloc(sizeof(*dev_dbgfs), GFP_KERNEL); + if (!dev_dbgfs) + return -ENOMEM; + adapter->dfsentry = dev_dbgfs; snprintf(devdir, sizeof(devdir), "%s", wiphy_name(adapter->hw->wiphy)); - dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL); - if (IS_ERR(dev_dbgfs->subdir)) { - if (dev_dbgfs->subdir == ERR_PTR(-ENODEV)) - rsi_dbg(ERR_ZONE, - "%s:Debugfs has not been mounted\n", __func__); - else - rsi_dbg(ERR_ZONE, "debugfs:%s not created\n", devdir); + dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL); - adapter->dfsentry = NULL; + if (!dev_dbgfs->subdir) { kfree(dev_dbgfs); - return (int)PTR_ERR(dev_dbgfs->subdir); - } else { - for (ii = 0; ii < adapter->num_debugfs_entries; ii++) { - files = &dev_debugfs_files[ii]; - dev_dbgfs->rsi_files[ii] = - debugfs_create_file(files->name, - files->perms, - dev_dbgfs->subdir, - common, - &files->fops); - } + return -ENOMEM; + } + + for (ii = 0; ii < adapter->num_debugfs_entries; ii++) { + files = &dev_debugfs_files[ii]; + dev_dbgfs->rsi_files[ii] = + debugfs_create_file(files->name, + files->perms, + dev_dbgfs->subdir, + common, + &files->fops); } return 0; }