| 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
| ||
|
Date: Thu, 25 Feb 2021 20:03:06 +0100
From: Pali Rohár <pali@...nel.org>
To: Sasha Levin <sashal@...nel.org>
Cc: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
Jakub Kicinski <kuba@...nel.org>, netdev@...r.kernel.org
Subject: Re: [PATCH AUTOSEL 5.11 16/67] net: sfp: add mode quirk for GPON
module Ubiquiti U-Fiber Instant
On Wednesday 24 February 2021 07:49:34 Sasha Levin wrote:
> From: Pali Rohár <pali@...nel.org>
>
> [ Upstream commit f0b4f847673299577c29b71d3f3acd3c313d81b7 ]
Hello! This commit requires also commit~1 from that patch series:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=426c6cbc409cbda9ab1a9dbf15d3c2ef947eb8c1
Without it kernel cannot read EEPROM from Ubiquiti U-Fiber Instant
module and therefore the hook based on EEPROM data which is below would
not be applied.
> The Ubiquiti U-Fiber Instant SFP GPON module has nonsensical information
> stored in its EEPROM. It claims to support all transceiver types including
> 10G Ethernet. Clear all claimed modes and set only 1000baseX_Full, which is
> the only one supported.
>
> This module has also phys_id set to SFF, and the SFP subsystem currently
> does not allow to use SFP modules detected as SFFs. Add exception for this
> module so it can be detected as supported.
>
> This change finally allows to detect and use SFP GPON module Ubiquiti
> U-Fiber Instant on Linux system.
>
> EEPROM content of this SFP module is (where XX is serial number):
>
> 00: 02 04 0b ff ff ff ff ff ff ff ff 03 0c 00 14 c8 ???........??.??
> 10: 00 00 00 00 55 42 4e 54 20 20 20 20 20 20 20 20 ....UBNT
> 20: 20 20 20 20 00 18 e8 29 55 46 2d 49 4e 53 54 41 .??)UF-INSTA
> 30: 4e 54 20 20 20 20 20 20 34 20 20 20 05 1e 00 36 NT 4 ??.6
> 40: 00 06 00 00 55 42 4e 54 XX XX XX XX XX XX XX XX .?..UBNTXXXXXXXX
> 50: 20 20 20 20 31 34 30 31 32 33 20 20 60 80 02 41 140123 `??A
>
> Signed-off-by: Pali Rohár <pali@...nel.org>
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
> Signed-off-by: Sasha Levin <sashal@...nel.org>
> ---
> drivers/net/phy/sfp-bus.c | 15 +++++++++++++++
> drivers/net/phy/sfp.c | 17 +++++++++++++++--
> 2 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
> index 20b91f5dfc6ed..4cf874fb5c5b4 100644
> --- a/drivers/net/phy/sfp-bus.c
> +++ b/drivers/net/phy/sfp-bus.c
> @@ -44,6 +44,17 @@ static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
> phylink_set(modes, 2500baseX_Full);
> }
>
> +static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id,
> + unsigned long *modes)
> +{
> + /* Ubiquiti U-Fiber Instant module claims that support all transceiver
> + * types including 10G Ethernet which is not truth. So clear all claimed
> + * modes and set only one mode which module supports: 1000baseX_Full.
> + */
> + phylink_zero(modes);
> + phylink_set(modes, 1000baseX_Full);
> +}
> +
> static const struct sfp_quirk sfp_quirks[] = {
> {
> // Alcatel Lucent G-010S-P can operate at 2500base-X, but
> @@ -63,6 +74,10 @@ static const struct sfp_quirk sfp_quirks[] = {
> .vendor = "HUAWEI",
> .part = "MA5671A",
> .modes = sfp_quirk_2500basex,
> + }, {
> + .vendor = "UBNT",
> + .part = "UF-INSTANT",
> + .modes = sfp_quirk_ubnt_uf_instant,
> },
> };
>
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 91d74c1a920ab..804295ad8a044 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -273,8 +273,21 @@ static const struct sff_data sff_data = {
>
> static bool sfp_module_supported(const struct sfp_eeprom_id *id)
> {
> - return id->base.phys_id == SFF8024_ID_SFP &&
> - id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
> + if (id->base.phys_id == SFF8024_ID_SFP &&
> + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP)
> + return true;
> +
> + /* SFP GPON module Ubiquiti U-Fiber Instant has in its EEPROM stored
> + * phys id SFF instead of SFP. Therefore mark this module explicitly
> + * as supported based on vendor name and pn match.
> + */
> + if (id->base.phys_id == SFF8024_ID_SFF_8472 &&
> + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP &&
> + !memcmp(id->base.vendor_name, "UBNT ", 16) &&
> + !memcmp(id->base.vendor_pn, "UF-INSTANT ", 16))
> + return true;
> +
> + return false;
> }
>
> static const struct sff_data sfp_data = {
> --
> 2.27.0
>
On Wednesday 24 February 2021 07:51:28 Sasha Levin wrote:
> From: Pali Rohár <pali@...nel.org>
>
> [ Upstream commit f0b4f847673299577c29b71d3f3acd3c313d81b7 ]
>
> The Ubiquiti U-Fiber Instant SFP GPON module has nonsensical information
> stored in its EEPROM. It claims to support all transceiver types including
> 10G Ethernet. Clear all claimed modes and set only 1000baseX_Full, which is
> the only one supported.
>
> This module has also phys_id set to SFF, and the SFP subsystem currently
> does not allow to use SFP modules detected as SFFs. Add exception for this
> module so it can be detected as supported.
>
> This change finally allows to detect and use SFP GPON module Ubiquiti
> U-Fiber Instant on Linux system.
>
> EEPROM content of this SFP module is (where XX is serial number):
>
> 00: 02 04 0b ff ff ff ff ff ff ff ff 03 0c 00 14 c8 ???........??.??
> 10: 00 00 00 00 55 42 4e 54 20 20 20 20 20 20 20 20 ....UBNT
> 20: 20 20 20 20 00 18 e8 29 55 46 2d 49 4e 53 54 41 .??)UF-INSTA
> 30: 4e 54 20 20 20 20 20 20 34 20 20 20 05 1e 00 36 NT 4 ??.6
> 40: 00 06 00 00 55 42 4e 54 XX XX XX XX XX XX XX XX .?..UBNTXXXXXXXX
> 50: 20 20 20 20 31 34 30 31 32 33 20 20 60 80 02 41 140123 `??A
>
> Signed-off-by: Pali Rohár <pali@...nel.org>
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
> Signed-off-by: Sasha Levin <sashal@...nel.org>
> ---
> drivers/net/phy/sfp-bus.c | 15 +++++++++++++++
> drivers/net/phy/sfp.c | 17 +++++++++++++++--
> 2 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
> index 58014feedf6c8..fb954e8141802 100644
> --- a/drivers/net/phy/sfp-bus.c
> +++ b/drivers/net/phy/sfp-bus.c
> @@ -44,6 +44,17 @@ static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
> phylink_set(modes, 2500baseX_Full);
> }
>
> +static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id,
> + unsigned long *modes)
> +{
> + /* Ubiquiti U-Fiber Instant module claims that support all transceiver
> + * types including 10G Ethernet which is not truth. So clear all claimed
> + * modes and set only one mode which module supports: 1000baseX_Full.
> + */
> + phylink_zero(modes);
> + phylink_set(modes, 1000baseX_Full);
> +}
> +
> static const struct sfp_quirk sfp_quirks[] = {
> {
> // Alcatel Lucent G-010S-P can operate at 2500base-X, but
> @@ -63,6 +74,10 @@ static const struct sfp_quirk sfp_quirks[] = {
> .vendor = "HUAWEI",
> .part = "MA5671A",
> .modes = sfp_quirk_2500basex,
> + }, {
> + .vendor = "UBNT",
> + .part = "UF-INSTANT",
> + .modes = sfp_quirk_ubnt_uf_instant,
> },
> };
>
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 34aa196b7465c..d8a809cf20c15 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -272,8 +272,21 @@ static const struct sff_data sff_data = {
>
> static bool sfp_module_supported(const struct sfp_eeprom_id *id)
> {
> - return id->base.phys_id == SFF8024_ID_SFP &&
> - id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
> + if (id->base.phys_id == SFF8024_ID_SFP &&
> + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP)
> + return true;
> +
> + /* SFP GPON module Ubiquiti U-Fiber Instant has in its EEPROM stored
> + * phys id SFF instead of SFP. Therefore mark this module explicitly
> + * as supported based on vendor name and pn match.
> + */
> + if (id->base.phys_id == SFF8024_ID_SFF_8472 &&
> + id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP &&
> + !memcmp(id->base.vendor_name, "UBNT ", 16) &&
> + !memcmp(id->base.vendor_pn, "UF-INSTANT ", 16))
> + return true;
> +
> + return false;
> }
>
> static const struct sff_data sfp_data = {
> --
> 2.27.0
>
Powered by blists - more mailing lists