Re: [PATCH 1/3] usbip: only dump valid port status

From: NÃmeth MÃrton
Date: Tue Jun 14 2011 - 00:55:36 EST


Joe Perches wrote:
> On Mon, 2011-06-13 at 23:47 +0200, NÃmeth MÃrton wrote:
>> From: MÃrton NÃmeth <nm127@xxxxxxxxxxx>
>>
>> The wIndex parameter of vhci_hub_control() is always zero when the
>> request type is GetHubDescriptor, see drivers/usb/core/hub.c::get_hub_descriptor()
>> and Universal Serial Bus Specification revision 2.0 (April 27, 2000) Section
>> 11.24.2.5 "Get Hub Descriptor". This means the variable rhport will not contain
>> any useful index. Only use valid rhport values.
>>
>> Signed-off-by: MÃrton NÃmeth <nm127@xxxxxxxxxxx>
>> ---
>> drivers/staging/usbip/vhci_hcd.c | 7 +++++--
>> 1 files changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
>> index 359b464..512a97f 100644
>> --- a/drivers/staging/usbip/vhci_hcd.c
>> +++ b/drivers/staging/usbip/vhci_hcd.c
>> @@ -464,8 +464,11 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
>>
>> if (usbip_dbg_flag_vhci_rh) {
>> pr_debug("port %d\n", rhport);
>> - dump_port_status(prev_port_status[rhport]);
>> - dump_port_status(dum->port_status[rhport]);
>> + /* Only dump valid port status */
>> + if (rhport >= 0) {
>> + dump_port_status(prev_port_status[rhport]);
>> + dump_port_status(dum->port_status[rhport]);
>> + }
>
> Umm, you mean to use "rhport > 0" yes?

No, it is really (rhport >= 0). The wIndex parameter is zero, the
rhport is wIndex - 1. So rhport zero is valid, rhport -1 is not valid.

Regards,

MÃrton NÃmeth
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/