Commit b25e77fd authored by Fariya Fatima's avatar Fariya Fatima Committed by John W. Linville
Browse files

rsi: Potential null pointer derefernce issue fixed. 



Signed-off-by: default avatarFariya Fatima <fariyaf@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ce7613db

drivers/net/wireless/rsi/rsi_91x_debugfs.c

+16 −19
Original line number Original line Diff line number Diff line
@@ -289,23 +289,21 @@ int rsi_init_dbgfs(struct rsi_hw *adapter) 
	const struct rsi_dbg_files *files;

	const struct rsi_dbg_files *files;





	dev_dbgfs = kzalloc(sizeof(*dev_dbgfs), GFP_KERNEL);

	dev_dbgfs = kzalloc(sizeof(*dev_dbgfs), GFP_KERNEL);

	if (!dev_dbgfs)

		return -ENOMEM;



	adapter->dfsentry = dev_dbgfs;

	adapter->dfsentry = dev_dbgfs;





	snprintf(devdir, sizeof(devdir), "%s",

	snprintf(devdir, sizeof(devdir), "%s",

		 wiphy_name(adapter->hw->wiphy));

		 wiphy_name(adapter->hw->wiphy));

	dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL);





	if (IS_ERR(dev_dbgfs->subdir)) {

	dev_dbgfs->subdir = debugfs_create_dir(devdir, NULL);

		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);





		adapter->dfsentry = NULL;

	if (!dev_dbgfs->subdir) {

		kfree(dev_dbgfs);

		kfree(dev_dbgfs);

		return (int)PTR_ERR(dev_dbgfs->subdir);

		return -ENOMEM;

	} else {

	}



	for (ii = 0; ii < adapter->num_debugfs_entries; ii++) {

	for (ii = 0; ii < adapter->num_debugfs_entries; ii++) {

		files = &dev_debugfs_files[ii];

		files = &dev_debugfs_files[ii];

		dev_dbgfs->rsi_files[ii] =

		dev_dbgfs->rsi_files[ii] =
@@ -315,7 +313,6 @@ int rsi_init_dbgfs(struct rsi_hw *adapter) 
				    common,

				    common,

				    &files->fops);

				    &files->fops);

	}

	}

	}

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(rsi_init_dbgfs);

EXPORT_SYMBOL_GPL(rsi_init_dbgfs);