[PATCH u-boot v2 1/2] eth/r8152: fix assigning the wrong endpoint

[Marek Vasut]

On 5/25/20 9:47 AM, Hayes Wang wrote:
> Although I think it never occurs, the code doesn't make sense, because
> it may allow to assign an IN endpoint to ss->ep_out.
> 
> Signed-off-by: Hayes Wang <hayeswang at realtek.com>
> ---
>  drivers/usb/eth/r8152.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
> index 61b8683230..9f7bc7986d 100644
> --- a/drivers/usb/eth/r8152.c
> +++ b/drivers/usb/eth/r8152.c
> @@ -1354,9 +1354,8 @@ int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
>  	struct usb_interface *iface;
>  	struct usb_interface_descriptor *iface_desc;
>  	int ep_in_found = 0, ep_out_found = 0;
> -	int i;
> -
>  	struct r8152 *tp;
> +	int i;
>  
>  	/* let's examine the device now */
>  	iface = &dev->config.if_desc[ifnum];
> @@ -1399,16 +1398,15 @@ int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
>  		if ((iface->ep_desc[i].bmAttributes &
>  		     USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
>  			u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
> +
>  			if ((ep_addr & USB_DIR_IN) && !ep_in_found) {
>  				ss->ep_in = ep_addr &
>  					USB_ENDPOINT_NUMBER_MASK;
>  				ep_in_found = 1;
> -			} else {
> -				if (!ep_out_found) {
> -					ss->ep_out = ep_addr &
> -						USB_ENDPOINT_NUMBER_MASK;
> -					ep_out_found = 1;
> -				}
> +			} else if ((ep_addr & USB_DIR_OUT) && !ep_out_found) {


Sorry, I was wrong in my previous suggestion, the USB_DIR_OUT macro is
expanded to 0, so this patch cannot work. 2/2 is already upstream. Do
you have a chance to test these patches before sending them ?