Re: [PATCH v2 2/3] staging: rtl8192u: move debug files to debugfs

Tong Zhang
2022-07-20T04:58:44Z

On Tue, Jul 19, 2022 at 5:53 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Mon, Jul 18, 2022 at 10:50:37PM -0700, Tong Zhang wrote:
> > There are 4 debug files created under /proc/net/[Devname]. Devname could
> > 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.
> > This is also to prepare for address rmmod warn issue.
>
> Minor comments based on good debugfs usage:
>
> > --- 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;
>
> Why do you need to save this dentry? Can't you just look it up when you
> want to remove the files?
>

Hi Greg,
Thanks for the comments.

I am thinking whether it is possible to rename the device and run
rmmod to remove something it shouldn't.
If we are using debugfs_lookup(dev->name, NULL), say, the existing
directories/files are

/sys/kernel/debug/DIRA
/sys/kernel/debug/wlan0

I then rename device wlan0 to DIRA, after that I remove the module by
doing rmmod.
Apparently either the wlan0 directory will not be renamed successfully
due to collision or DIRA directory might be overwritten? (this part I
haven't checked yet)
Either Way, later on if we do rmmod, the driver will try to do
debugfs_lookup("fileA", NULL) and remove /sys/kernel/debug/DIRA which
it shouldn't.
Or if it is possible to rename the device to some wacky string
containing wildcard or .. to launch an attack.

Maybe I am being naive but please correct me if I am wrong.

Or maybe we should put those debug files under the module's own
directory and do lookup from there instead. like the following dir
structure

/sys/kernel/debug/r8192u_usb/wlan0/stats-rx
/sys/kernel/debug/r8192u_usb/wlan0/stats-rx
/sys/kernel/debug/r8192u_usb/wlan0/stats-ap
/sys/kernel/debug/r8192u_usb/wlan0/registers

> > +void rtl8192_debugfs_init(struct net_device *dev)
> > {
> > - struct proc_dir_entry *dir;
> > + struct dentry *dir;
> > + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
>
> No need to cast this. Same for later on in this file.
>

agreed, will remove those redundant checks.

> > - if (!rtl8192_proc)
> > + dir = debugfs_create_dir(dev->name, NULL);
> > + if (IS_ERR(dir))
> > return;
>
> No need to check, just keep moving on.
>
> >
> > - dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
> > - if (!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);
> >
> > - 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);
> > + priv->debugfs_dir = dir;
>
> Again, no need to save this, just look it up when removing the
> directory.
>
> thanks,
>
> greg k-h

Thanks and have a good one!
- Tong