| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAMhUBjmMe0a7eFy6JJA-_4Y9VmwOsD-Qn4yZ8uiNJcwNBH+Z5w@mail.gmail.com>
Date: Sun, 17 Jul 2022 16:04:49 +0800
From: Zheyu Ma <zheyuma97@...il.com>
To: Tong Zhang <ztong0001@...il.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jakub Kicinski <kuba@...nel.org>,
Colin Ian King <colin.king@...el.com>,
Saurav Girepunje <saurav.girepunje@...il.com>,
Johan Hovold <johan@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
linux-staging@...ts.linux.dev
Subject: Re: [PATCH] staging: rtl8192u: fix rmmod warn when wlan0 is renamed
On Sun, Jul 17, 2022 at 3:02 PM Tong Zhang <ztong0001@...il.com> wrote:
>
> There are 4 debug files created under /proc/net/[Devname]. Devname could
> be wlan0 initially, however it could be renamed later to e.g. enx00e04c000002.
> This will cause problem during debug file teardown since it uses
> netdev->name which is no longer wlan0. To solve this problem, add a
> notifier to handle device renaming.
>
> Also, due to this is purely for debuging as files are created read only,
> move this to debugfs like other NIC drivers do instead of using procfs.
>
> Reported-by: Zheyu Ma <zheyuma97@...il.com>
> Signed-off-by: Tong Zhang <ztong0001@...il.com>
> ---
> drivers/staging/rtl8192u/Makefile | 1 +
> drivers/staging/rtl8192u/r8192U.h | 7 +
> drivers/staging/rtl8192u/r8192U_core.c | 220 ++++------------------
> drivers/staging/rtl8192u/r8192U_debugfs.c | 185 ++++++++++++++++++
> 4 files changed, 230 insertions(+), 183 deletions(-)
> create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c
>
> diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
> index 0be7426b6ebc..d32dfd89a606 100644
> --- a/drivers/staging/rtl8192u/Makefile
> +++ b/drivers/staging/rtl8192u/Makefile
> @@ -8,6 +8,7 @@ ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
> r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \
> r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o \
> r819xU_cmdpkt.o r8192U_dm.o r819xU_firmware_img.o \
> + r8192U_debugfs.o \
> ieee80211/ieee80211_crypt.o \
> ieee80211/ieee80211_crypt_tkip.o \
> ieee80211/ieee80211_crypt_ccmp.o \
> diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
> index 14ca00a2789b..34ed013aabf1 100644
> --- a/drivers/staging/rtl8192u/r8192U.h
> +++ b/drivers/staging/rtl8192u/r8192U.h
> @@ -1061,6 +1061,9 @@ typedef struct r8192_priv {
> struct delayed_work gpio_change_rf_wq;
> struct delayed_work initialgain_operate_wq;
> struct workqueue_struct *priv_wq;
> +
> + /* debugfs */
> + struct dentry *debugfs_dir;
> } r8192_priv;
>
> /* For rtl8187B */
> @@ -1117,4 +1120,8 @@ void EnableHWSecurityConfig8192(struct net_device *dev);
> void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
> const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);
>
> +void rtl8192_debugfs_init(struct net_device *dev);
> +void rtl8192_debugfs_exit(struct net_device *dev);
> +void rtl8192_debugfs_rename(struct net_device *dev);
> +
> #endif
> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index 2ca925f35830..2fba1cf59372 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -56,7 +56,6 @@ double __extendsfdf2(float a)
> #include "r8192U_dm.h"
> #include <linux/usb.h>
> #include <linux/slab.h>
> -#include <linux/proc_fs.h>
> #include <linux/seq_file.h>
> /* FIXME: check if 2.6.7 is ok */
>
> @@ -452,179 +451,6 @@ static struct net_device_stats *rtl8192_stats(struct net_device *dev);
> static void rtl8192_restart(struct work_struct *work);
> static void watch_dog_timer_callback(struct timer_list *t);
>
> -/****************************************************************************
> - * -----------------------------PROCFS STUFF-------------------------
> - ****************************************************************************/
> -
> -static struct proc_dir_entry *rtl8192_proc;
> -
> -static int __maybe_unused proc_get_stats_ap(struct seq_file *m, void *v)
> -{
> - struct net_device *dev = m->private;
> - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> - struct ieee80211_device *ieee = priv->ieee80211;
> - struct ieee80211_network *target;
> -
> - list_for_each_entry(target, &ieee->network_list, list) {
> - const char *wpa = "non_WPA";
> -
> - if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
> - wpa = "WPA";
> -
> - seq_printf(m, "%s %s\n", target->ssid, wpa);
> - }
> -
> - return 0;
> -}
> -
> -static int __maybe_unused proc_get_registers(struct seq_file *m, void *v)
> -{
> - struct net_device *dev = m->private;
> - int i, n, max = 0xff;
> - u8 byte_rd;
> -
> - seq_puts(m, "\n####################page 0##################\n ");
> -
> - for (n = 0; n <= max;) {
> - seq_printf(m, "\nD: %2x > ", n);
> -
> - for (i = 0; i < 16 && n <= max; i++, n++) {
> - read_nic_byte(dev, 0x000 | n, &byte_rd);
> - seq_printf(m, "%2x ", byte_rd);
> - }
> - }
> -
> - seq_puts(m, "\n####################page 1##################\n ");
> - for (n = 0; n <= max;) {
> - seq_printf(m, "\nD: %2x > ", n);
> -
> - for (i = 0; i < 16 && n <= max; i++, n++) {
> - read_nic_byte(dev, 0x100 | n, &byte_rd);
> - seq_printf(m, "%2x ", byte_rd);
> - }
> - }
> -
> - seq_puts(m, "\n####################page 3##################\n ");
> - for (n = 0; n <= max;) {
> - seq_printf(m, "\nD: %2x > ", n);
> -
> - for (i = 0; i < 16 && n <= max; i++, n++) {
> - read_nic_byte(dev, 0x300 | n, &byte_rd);
> - seq_printf(m, "%2x ", byte_rd);
> - }
> - }
> -
> - seq_putc(m, '\n');
> - return 0;
> -}
> -
> -static int __maybe_unused proc_get_stats_tx(struct seq_file *m, void *v)
> -{
> - struct net_device *dev = m->private;
> - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> -
> - seq_printf(m,
> - "TX VI priority ok int: %lu\n"
> - "TX VI priority error int: %lu\n"
> - "TX VO priority ok int: %lu\n"
> - "TX VO priority error int: %lu\n"
> - "TX BE priority ok int: %lu\n"
> - "TX BE priority error int: %lu\n"
> - "TX BK priority ok int: %lu\n"
> - "TX BK priority error int: %lu\n"
> - "TX MANAGE priority ok int: %lu\n"
> - "TX MANAGE priority error int: %lu\n"
> - "TX BEACON priority ok int: %lu\n"
> - "TX BEACON priority error int: %lu\n"
> - "TX queue resume: %lu\n"
> - "TX queue stopped?: %d\n"
> - "TX fifo overflow: %lu\n"
> - "TX VI queue: %d\n"
> - "TX VO queue: %d\n"
> - "TX BE queue: %d\n"
> - "TX BK queue: %d\n"
> - "TX VI dropped: %lu\n"
> - "TX VO dropped: %lu\n"
> - "TX BE dropped: %lu\n"
> - "TX BK dropped: %lu\n"
> - "TX total data packets %lu\n",
> - priv->stats.txviokint,
> - priv->stats.txvierr,
> - priv->stats.txvookint,
> - priv->stats.txvoerr,
> - priv->stats.txbeokint,
> - priv->stats.txbeerr,
> - priv->stats.txbkokint,
> - priv->stats.txbkerr,
> - priv->stats.txmanageokint,
> - priv->stats.txmanageerr,
> - priv->stats.txbeaconokint,
> - priv->stats.txbeaconerr,
> - priv->stats.txresumed,
> - netif_queue_stopped(dev),
> - priv->stats.txoverflow,
> - atomic_read(&(priv->tx_pending[VI_PRIORITY])),
> - atomic_read(&(priv->tx_pending[VO_PRIORITY])),
> - atomic_read(&(priv->tx_pending[BE_PRIORITY])),
> - atomic_read(&(priv->tx_pending[BK_PRIORITY])),
> - priv->stats.txvidrop,
> - priv->stats.txvodrop,
> - priv->stats.txbedrop,
> - priv->stats.txbkdrop,
> - priv->stats.txdatapkt
> - );
> -
> - return 0;
> -}
> -
> -static int __maybe_unused proc_get_stats_rx(struct seq_file *m, void *v)
> -{
> - struct net_device *dev = m->private;
> - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> -
> - seq_printf(m,
> - "RX packets: %lu\n"
> - "RX urb status error: %lu\n"
> - "RX invalid urb error: %lu\n",
> - priv->stats.rxoktotal,
> - priv->stats.rxstaterr,
> - priv->stats.rxurberr);
> -
> - return 0;
> -}
> -
> -static void rtl8192_proc_module_init(void)
> -{
> - RT_TRACE(COMP_INIT, "Initializing proc filesystem");
> - rtl8192_proc = proc_mkdir(RTL819XU_MODULE_NAME, init_net.proc_net);
> -}
> -
> -static void rtl8192_proc_init_one(struct net_device *dev)
> -{
> - struct proc_dir_entry *dir;
> -
> - if (!rtl8192_proc)
> - return;
> -
> - dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
> - if (!dir)
> - return;
> -
> - proc_create_single("stats-rx", S_IFREG | 0444, dir,
> - proc_get_stats_rx);
> - proc_create_single("stats-tx", S_IFREG | 0444, dir,
> - proc_get_stats_tx);
> - proc_create_single("stats-ap", S_IFREG | 0444, dir,
> - proc_get_stats_ap);
> - proc_create_single("registers", S_IFREG | 0444, dir,
> - proc_get_registers);
> -}
> -
> -static void rtl8192_proc_remove_one(struct net_device *dev)
> -{
> - remove_proc_subtree(dev->name, rtl8192_proc);
> -}
> -
> /****************************************************************************
> * -----------------------------MISC STUFF-------------------------
> *****************************************************************************/
> @@ -4730,7 +4556,7 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
> goto fail2;
>
> RT_TRACE(COMP_INIT, "dev name=======> %s\n", dev->name);
> - rtl8192_proc_init_one(dev);
> + rtl8192_debugfs_init(dev);
>
> RT_TRACE(COMP_INIT, "Driver probe completed\n");
> return 0;
> @@ -4764,11 +4590,9 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)
> struct net_device *dev = usb_get_intfdata(intf);
> struct r8192_priv *priv = ieee80211_priv(dev);
>
> - unregister_netdev(dev);
> -
> RT_TRACE(COMP_DOWN, "=============>wlan driver to be removed\n");
> - rtl8192_proc_remove_one(dev);
> -
> + rtl8192_debugfs_exit(dev);
> + unregister_netdev(dev);
> rtl8192_down(dev);
> kfree(priv->pFirmware);
> priv->pFirmware = NULL;
> @@ -4779,6 +4603,32 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)
> RT_TRACE(COMP_DOWN, "wlan driver removed\n");
> }
>
> +static int rtl8192_usb_netdev_event(struct notifier_block *nb, unsigned long event,
> + void *data)
> +{
> + struct net_device *netdev = netdev_notifier_info_to_dev(data);
> +
> + if (netdev->netdev_ops != &rtl8192_netdev_ops)
> + goto out;
> +
> + switch (event) {
> + case NETDEV_CHANGENAME:
> + rtl8192_debugfs_rename(netdev);
> + break;
> +
> + default:
> + break;
> + }
> +
> +out:
> + return NOTIFY_DONE;
> +}
> +
> +static struct notifier_block rtl8192_usb_netdev_notifier = {
> + .notifier_call = rtl8192_usb_netdev_event,
> +};
> +
> +
> static int __init rtl8192_usb_module_init(void)
> {
> int ret;
> @@ -4788,10 +4638,14 @@ static int __init rtl8192_usb_module_init(void)
> RT_TRACE(COMP_INIT, "Initializing module");
> RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT);
>
> + ret = register_netdevice_notifier(&rtl8192_usb_netdev_notifier);
> + if (ret)
> + return ret;
> +
> ret = ieee80211_debug_init();
> if (ret) {
> pr_err("ieee80211_debug_init() failed %d\n", ret);
> - return ret;
> + goto debug_init;
> }
>
> ret = ieee80211_crypto_init();
> @@ -4818,14 +4672,12 @@ static int __init rtl8192_usb_module_init(void)
> goto crypto_ccmp_exit;
> }
>
> - rtl8192_proc_module_init();
> ret = usb_register(&rtl8192_usb_driver);
> if (ret)
> goto rtl8192_proc_module_exit;
> return ret;
>
> rtl8192_proc_module_exit:
> - remove_proc_entry(RTL819XU_MODULE_NAME, init_net.proc_net);
> ieee80211_crypto_wep_exit();
> crypto_ccmp_exit:
> ieee80211_crypto_ccmp_exit();
> @@ -4835,18 +4687,20 @@ static int __init rtl8192_usb_module_init(void)
> ieee80211_crypto_deinit();
> debug_exit:
> ieee80211_debug_exit();
> +debug_init:
> + unregister_netdevice_notifier(&rtl8192_usb_netdev_notifier);
> return ret;
> }
>
> static void __exit rtl8192_usb_module_exit(void)
> {
> usb_deregister(&rtl8192_usb_driver);
> - remove_proc_entry(RTL819XU_MODULE_NAME, init_net.proc_net);
> ieee80211_crypto_wep_exit();
> ieee80211_crypto_ccmp_exit();
> ieee80211_crypto_tkip_exit();
> ieee80211_crypto_deinit();
> ieee80211_debug_exit();
> + unregister_netdevice_notifier(&rtl8192_usb_netdev_notifier);
> RT_TRACE(COMP_DOWN, "Exiting");
> }
>
> diff --git a/drivers/staging/rtl8192u/r8192U_debugfs.c b/drivers/staging/rtl8192u/r8192U_debugfs.c
> new file mode 100644
> index 000000000000..96cdc245bd03
> --- /dev/null
> +++ b/drivers/staging/rtl8192u/r8192U_debugfs.c
> @@ -0,0 +1,185 @@
> +#include <linux/debugfs.h>
> +#include <linux/seq_file.h>
> +#include <linux/module.h>
> +#include "r8192U.h"
> +
> +static int rtl8192_usb_stats_rx_show(struct seq_file *m, void *v)
> +{
> + struct net_device *dev = m->private;
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> +
> + seq_printf(m,
> + "RX packets: %lu\n"
> + "RX urb status error: %lu\n"
> + "RX invalid urb error: %lu\n",
> + priv->stats.rxoktotal,
> + priv->stats.rxstaterr,
> + priv->stats.rxurberr);
> +
> + return 0;
> +}
> +
> +static int rtl8192_usb_stats_tx_show(struct seq_file *m, void *v)
> +{
> + struct net_device *dev = m->private;
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> +
> + seq_printf(m,
> + "TX VI priority ok int: %lu\n"
> + "TX VI priority error int: %lu\n"
> + "TX VO priority ok int: %lu\n"
> + "TX VO priority error int: %lu\n"
> + "TX BE priority ok int: %lu\n"
> + "TX BE priority error int: %lu\n"
> + "TX BK priority ok int: %lu\n"
> + "TX BK priority error int: %lu\n"
> + "TX MANAGE priority ok int: %lu\n"
> + "TX MANAGE priority error int: %lu\n"
> + "TX BEACON priority ok int: %lu\n"
> + "TX BEACON priority error int: %lu\n"
> + "TX queue resume: %lu\n"
> + "TX queue stopped?: %d\n"
> + "TX fifo overflow: %lu\n"
> + "TX VI queue: %d\n"
> + "TX VO queue: %d\n"
> + "TX BE queue: %d\n"
> + "TX BK queue: %d\n"
> + "TX VI dropped: %lu\n"
> + "TX VO dropped: %lu\n"
> + "TX BE dropped: %lu\n"
> + "TX BK dropped: %lu\n"
> + "TX total data packets %lu\n",
> + priv->stats.txviokint,
> + priv->stats.txvierr,
> + priv->stats.txvookint,
> + priv->stats.txvoerr,
> + priv->stats.txbeokint,
> + priv->stats.txbeerr,
> + priv->stats.txbkokint,
> + priv->stats.txbkerr,
> + priv->stats.txmanageokint,
> + priv->stats.txmanageerr,
> + priv->stats.txbeaconokint,
> + priv->stats.txbeaconerr,
> + priv->stats.txresumed,
> + netif_queue_stopped(dev),
> + priv->stats.txoverflow,
> + atomic_read(&(priv->tx_pending[VI_PRIORITY])),
> + atomic_read(&(priv->tx_pending[VO_PRIORITY])),
> + atomic_read(&(priv->tx_pending[BE_PRIORITY])),
> + atomic_read(&(priv->tx_pending[BK_PRIORITY])),
> + priv->stats.txvidrop,
> + priv->stats.txvodrop,
> + priv->stats.txbedrop,
> + priv->stats.txbkdrop,
> + priv->stats.txdatapkt
> + );
> +
> + return 0;
> +}
> +
> +static int rtl8192_usb_stats_ap_show(struct seq_file *m, void *v)
> +{
> + struct net_device *dev = m->private;
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> + struct ieee80211_device *ieee = priv->ieee80211;
> + struct ieee80211_network *target;
> +
> + list_for_each_entry(target, &ieee->network_list, list) {
> + const char *wpa = "non_WPA";
> +
> + if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
> + wpa = "WPA";
> +
> + seq_printf(m, "%s %s\n", target->ssid, wpa);
> + }
> +
> + return 0;
> +}
> +
> +static int rtl8192_usb_registers_show(struct seq_file *m, void *v)
> +{
> + struct net_device *dev = m->private;
> + int i, n, max = 0xff;
> + u8 byte_rd;
> +
> + seq_puts(m, "\n####################page 0##################\n ");
> +
> + for (n = 0; n <= max;) {
> + seq_printf(m, "\nD: %2x > ", n);
> +
> + for (i = 0; i < 16 && n <= max; i++, n++) {
> + read_nic_byte(dev, 0x000 | n, &byte_rd);
> + seq_printf(m, "%2x ", byte_rd);
> + }
> + }
> +
> + seq_puts(m, "\n####################page 1##################\n ");
> + for (n = 0; n <= max;) {
> + seq_printf(m, "\nD: %2x > ", n);
> +
> + for (i = 0; i < 16 && n <= max; i++, n++) {
> + read_nic_byte(dev, 0x100 | n, &byte_rd);
> + seq_printf(m, "%2x ", byte_rd);
> + }
> + }
> +
> + seq_puts(m, "\n####################page 3##################\n ");
> + for (n = 0; n <= max;) {
> + seq_printf(m, "\nD: %2x > ", n);
> +
> + for (i = 0; i < 16 && n <= max; i++, n++) {
> + read_nic_byte(dev, 0x300 | n, &byte_rd);
> + seq_printf(m, "%2x ", byte_rd);
> + }
> + }
> +
> + seq_putc(m, '\n');
> + return 0;
> +}
> +
> +DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_rx);
> +DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_tx);
> +DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_ap);
> +DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_registers);
> +
> +void rtl8192_debugfs_init(struct net_device *dev)
> +{
> + struct dentry *dir;
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> +
> + dir = debugfs_create_dir(dev->name, NULL);
> + if (IS_ERR_OR_NULL(dir))
> + return;
> +
> + debugfs_create_file("stats-rx", 0444, dir, dev, &rtl8192_usb_stats_rx_fops);
> + debugfs_create_file("stats-tx", 0444, dir, dev, &rtl8192_usb_stats_tx_fops);
> + debugfs_create_file("stats-ap", 0444, dir, dev, &rtl8192_usb_stats_ap_fops);
> + debugfs_create_file("registers", 0444, dir, dev, &rtl8192_usb_registers_fops);
> +
> + priv->debugfs_dir = dir;
> +}
> +
> +void rtl8192_debugfs_exit(struct net_device *dev)
> +{
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> + if (!priv->debugfs_dir)
> + return;
> + debugfs_remove_recursive(priv->debugfs_dir);
> + priv->debugfs_dir = NULL;
> +}
> +
> +void rtl8192_debugfs_rename(struct net_device *dev)
> +{
> + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
> +
> + if (!priv->debugfs_dir)
> + return;
> +
> + if (!strcmp(priv->debugfs_dir->d_name.name, dev->name))
> + return;
> +
> + debugfs_rename(priv->debugfs_dir->d_parent, priv->debugfs_dir,
> + priv->debugfs_dir->d_parent, dev->name);
> +}
> +
> --
> 2.25.1
Thanks for your patch, it works for me :)
Tested-by: Zheyu Ma <zheyuma97@...il.com>
regards,
Zheyu Ma
Powered by blists - more mailing lists