linux-kernel - Re: PROBLEM: No static MAC address for usb gadget ethernet via kernel parameter any more.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <689d5b9d-3d1e-75be-ea0d-250e16b6d85c@mail.msdigital.de>
Date:   Tue, 31 May 2022 10:38:21 +0200
From:   Maximilian Senftleben <kernel@...l.msdigital.de>
To:     Marian Postevca <posteuca@...ex.one>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: PROBLEM: No static MAC address for usb gadget ethernet via kernel
 parameter any more.

Just tested, the fix works for me.

Am 26.05.2022 um 08:54 schrieb Marian Postevca:
> Could you test if this patch fixes the issue for you?
> Should apply without problems on kernel 5.17.
> ---
>   drivers/usb/gadget/function/u_ether.c | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
> index 6f5d45ef2e39a..b5bf51cdc3c8f 100644
> --- a/drivers/usb/gadget/function/u_ether.c
> +++ b/drivers/usb/gadget/function/u_ether.c
> @@ -775,9 +775,14 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g,
>   	dev->qmult = qmult;
>   	snprintf(net->name, sizeof(net->name), "%s%%d", netname);
>   
> -	if (get_ether_addr(dev_addr, addr))
> +	if (get_ether_addr(dev_addr, addr)) {
> +		net->addr_assign_type = NET_ADDR_RANDOM;
>   		dev_warn(&g->dev,
>   			"using random %s ethernet address\n", "self");
> +	}
> +	else {
> +		net->addr_assign_type = NET_ADDR_SET;
> +	}
>   	eth_hw_addr_set(net, addr);
>   	if (get_ether_addr(host_addr, dev->host_mac))
>   		dev_warn(&g->dev,
> @@ -835,6 +840,9 @@ struct net_device *gether_setup_name_default(const char *netname)
>   	INIT_LIST_HEAD(&dev->tx_reqs);
>   	INIT_LIST_HEAD(&dev->rx_reqs);
>   
> +	/* by default we always have a random MAC address */
> +	net->addr_assign_type = NET_ADDR_RANDOM;
> +
>   	skb_queue_head_init(&dev->rx_frames);
>   
>   	/* network device setup */
> @@ -871,7 +879,6 @@ int gether_register_netdev(struct net_device *net)
>   	dev = netdev_priv(net);
>   	g = dev->gadget;
>   
> -	net->addr_assign_type = NET_ADDR_RANDOM;
>   	eth_hw_addr_set(net, dev->dev_mac);
>   
>   	status = register_netdev(net);
> @@ -912,6 +919,7 @@ int gether_set_dev_addr(struct net_device *net, const char *dev_addr)
>   	if (get_ether_addr(dev_addr, new_addr))
>   		return -EINVAL;
>   	memcpy(dev->dev_mac, new_addr, ETH_ALEN);
> +	net->addr_assign_type = NET_ADDR_SET;
>   	return 0;
>   }
>   EXPORT_SYMBOL_GPL(gether_set_dev_addr);