From: Kristian Evensen <kristian.evensen@gmail.com> To: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kristian Evensen <kristian.evensen@gmail.com> Subject: [PATCH] rndis_host: Set random MAC for ZTE MF910 Date: Wed, 13 Jul 2016 18:39:05 +0200 [thread overview] Message-ID: <1468427945-11600-1-git-send-email-kristian.evensen@gmail.com> (raw) From: Kristian Evensen <kristian.evensen@gmail.com> All ZTE MF910 mifis, at least on some revisions, export the same MAC address (36:4b:50:b7:ef:da). Check for this MAC address and set a random MAC if detected. Also, changed the memcpy() to ether_addr_copy(), as pointed out by checkpatch. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> --- drivers/net/usb/rndis_host.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 524a47a281..85bdbdf 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -295,6 +295,9 @@ static const struct net_device_ops rndis_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +/* well-known buggy ZTE MF910 MAC address */ +static const u8 buggy_zte_addr[ETH_ALEN] = {0x36, 0x4b, 0x50, 0xb7, 0xef, 0xda}; + int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) { @@ -428,7 +431,11 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); goto halt_fail_and_release; } - memcpy(net->dev_addr, bp, ETH_ALEN); + + if (ether_addr_equal(bp, buggy_zte_addr)) + eth_hw_addr_random(net); + else + ether_addr_copy(net->dev_addr, bp); /* set a nonzero filter to enable data transfers */ memset(u.set, 0, sizeof *u.set); -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Kristian Evensen <kristian.evensen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Kristian Evensen <kristian.evensen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Subject: [PATCH] rndis_host: Set random MAC for ZTE MF910 Date: Wed, 13 Jul 2016 18:39:05 +0200 [thread overview] Message-ID: <1468427945-11600-1-git-send-email-kristian.evensen@gmail.com> (raw) From: Kristian Evensen <kristian.evensen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> All ZTE MF910 mifis, at least on some revisions, export the same MAC address (36:4b:50:b7:ef:da). Check for this MAC address and set a random MAC if detected. Also, changed the memcpy() to ether_addr_copy(), as pointed out by checkpatch. Signed-off-by: Kristian Evensen <kristian.evensen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- drivers/net/usb/rndis_host.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 524a47a281..85bdbdf 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -295,6 +295,9 @@ static const struct net_device_ops rndis_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +/* well-known buggy ZTE MF910 MAC address */ +static const u8 buggy_zte_addr[ETH_ALEN] = {0x36, 0x4b, 0x50, 0xb7, 0xef, 0xda}; + int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) { @@ -428,7 +431,11 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval); goto halt_fail_and_release; } - memcpy(net->dev_addr, bp, ETH_ALEN); + + if (ether_addr_equal(bp, buggy_zte_addr)) + eth_hw_addr_random(net); + else + ether_addr_copy(net->dev_addr, bp); /* set a nonzero filter to enable data transfers */ memset(u.set, 0, sizeof *u.set); -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next reply other threads:[~2016-07-13 16:39 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-13 16:39 Kristian Evensen [this message] 2016-07-13 16:39 ` [PATCH] rndis_host: Set random MAC for ZTE MF910 Kristian Evensen 2016-07-13 22:23 ` Bjørn Mork 2016-07-13 22:23 ` Bjørn Mork 2016-07-14 7:54 ` Kristian Evensen 2016-07-14 7:54 ` Kristian Evensen 2016-07-14 8:01 ` Kristian Evensen 2016-07-15 16:42 ` David Laight 2016-07-15 17:42 ` Bjørn Mork 2016-07-17 3:02 ` David Miller 2016-07-17 3:02 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1468427945-11600-1-git-send-email-kristian.evensen@gmail.com \ --to=kristian.evensen@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.