lkml.org 
[lkml]   [2018]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 055/143] usbip: vhci_hcd: update status file header and format
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 5468099c747240ed97dbb34340fece8ca87be34f ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/usbip/vhci_sysfs.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
    index 4a22a9f06d96..eb7898353457 100644
    --- a/drivers/usb/usbip/vhci_sysfs.c
    +++ b/drivers/usb/usbip/vhci_sysfs.c
    @@ -34,10 +34,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
    @@ -61,13 +61,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");
    @@ -165,7 +165,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)
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-02 20:00    [W:2.384 / U:3.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site