Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 882b7b7d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove log_event debugfs file debugging is disabled 



When debugging is disabled, the event log functions aren't
functional in the way that the debugfs file expects. This
leads to the debugfs access crashing. Since the event log
functions aren't functional then, remove the debugfs file
when CONFIG_IWLWIFI_DEBUG is not set.

Cc: stable@kernel.org
Reported-by: default avatarLekensteyn <lekensteyn@gmail.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f18e3c6b

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+6 −0
Original line number Diff line number Diff line
@@ -2239,6 +2239,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file, 
	return count;

}



#ifdef CONFIG_IWLWIFI_DEBUG

static ssize_t iwl_dbgfs_log_event_read(struct file *file,

					 char __user *user_buf,

					 size_t count, loff_t *ppos)
@@ -2276,6 +2277,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, 


	return count;

}

#endif



static ssize_t iwl_dbgfs_calib_disabled_read(struct file *file,

					 char __user *user_buf,
@@ -2345,7 +2347,9 @@ DEBUGFS_READ_FILE_OPS(bt_traffic); 
DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);

DEBUGFS_READ_FILE_OPS(reply_tx_error);

DEBUGFS_WRITE_FILE_OPS(echo_test);

#ifdef CONFIG_IWLWIFI_DEBUG

DEBUGFS_READ_WRITE_FILE_OPS(log_event);

#endif

DEBUGFS_READ_WRITE_FILE_OPS(calib_disabled);



/*
@@ -2405,7 +2409,9 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) 
	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);

#ifdef CONFIG_IWLWIFI_DEBUG

	DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);

#endif



	if (iwl_advanced_bt_coexist(priv))

		DEBUGFS_ADD_FILE(bt_traffic, dir_debug, S_IRUSR);