usbip: vhci_hcd: update 'status' file header and format

Commit 2f2d0088eb93
("usbip: prevent vhci_hcd driver from leaking a socket pointer address")
in the /sys/devices/platform/vhci_hcd/status.

Fix the header and field alignment to reflect the changes and make it
easier to read.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index 091f76b7196d21da57d4adf1cca91fae29377fdd..a9de15cab2ecd6bba325339629d4a64156815ba7 100644 (file)
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -17,10 +17,10 @@
 
 /*
  * output example:
- * hub port sta spd dev       sockfd    local_busid
- * hs  0000 004 000 00000000  3         1-2.3
+ * hub port sta spd dev       sockfd local_busid
+ * hs  0000 004 000 00000000  000003 1-2.3
  * ................................................
- * ss  0008 004 000 00000000  4         2-3.4
+ * ss  0008 004 000 00000000  000004 2-3.4
  * ................................................
  *
  * Output includes socket fd instead of socket pointer address to avoid
@@ -44,13 +44,13 @@ static void port_show_vhci(char **out, int hub, int port, struct vhci_device *vd
        if (vdev->ud.status == VDEV_ST_USED) {
                *out += sprintf(*out, "%03u %08x ",
                                      vdev->speed, vdev->devid);
-               *out += sprintf(*out, "%u %s",
+               *out += sprintf(*out, "%06u %s",
                                      vdev->ud.sockfd,
                                      dev_name(&vdev->udev->dev));
 
        } else {
                *out += sprintf(*out, "000 00000000 ");
-               *out += sprintf(*out, "0000000000000000 0-0");
+               *out += sprintf(*out, "000000 0-0");
        }
 
        *out += sprintf(*out, "\n");
@@ -148,7 +148,7 @@ static ssize_t status_show(struct device *dev,
        int pdev_nr;
 
        out += sprintf(out,
-                      "hub port sta spd dev      socket           local_busid\n");
+                      "hub port sta spd dev      sockfd local_busid\n");
 
        pdev_nr = status_name_to_id(attr->attr.name);
        if (pdev_nr < 0)