Message ID | E1pwLr2-001Ms2-3d@rmk-PC.armlinux.org.uk (mailing list archive) |
---|---|
State | Accepted |
Commit | 43fb622d91a9f408322735d2f736495c1009f575 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] net: pcs: xpcs: fix incorrect number of interfaces | expand |
On Tue, May 09, 2023 at 12:50:04PM +0100, Russell King (Oracle) wrote: > In synopsys_xpcs_compat[], the DW_XPCS_2500BASEX entry was setting > the number of interfaces using the xpcs_2500basex_features array > rather than xpcs_2500basex_interfaces. This causes us to overflow > the array of interfaces. Fix this. > > Fixes: f27abde3042a ("net: pcs: add 2500BASEX support for Intel mGbE controller") > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Tue, May 09, 2023 at 12:50:04PM +0100, Russell King (Oracle) wrote: > In synopsys_xpcs_compat[], the DW_XPCS_2500BASEX entry was setting > the number of interfaces using the xpcs_2500basex_features array > rather than xpcs_2500basex_interfaces. This causes us to overflow > the array of interfaces. Fix this. > > Fixes: f27abde3042a ("net: pcs: add 2500BASEX support for Intel mGbE controller") > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > drivers/net/pcs/pcs-xpcs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Tue, 09 May 2023 12:50:04 +0100 you wrote: > In synopsys_xpcs_compat[], the DW_XPCS_2500BASEX entry was setting > the number of interfaces using the xpcs_2500basex_features array > rather than xpcs_2500basex_interfaces. This causes us to overflow > the array of interfaces. Fix this. > > Fixes: f27abde3042a ("net: pcs: add 2500BASEX support for Intel mGbE controller") > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > > [...] Here is the summary with links: - [net] net: pcs: xpcs: fix incorrect number of interfaces https://git.kernel.org/netdev/net/c/43fb622d91a9 You are awesome, thank you!
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 539cd43eae8d..f19d48c94fe0 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -1203,7 +1203,7 @@ static const struct xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = { [DW_XPCS_2500BASEX] = { .supported = xpcs_2500basex_features, .interface = xpcs_2500basex_interfaces, - .num_interfaces = ARRAY_SIZE(xpcs_2500basex_features), + .num_interfaces = ARRAY_SIZE(xpcs_2500basex_interfaces), .an_mode = DW_2500BASEX, }, };
In synopsys_xpcs_compat[], the DW_XPCS_2500BASEX entry was setting the number of interfaces using the xpcs_2500basex_features array rather than xpcs_2500basex_interfaces. This causes us to overflow the array of interfaces. Fix this. Fixes: f27abde3042a ("net: pcs: add 2500BASEX support for Intel mGbE controller") Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/pcs/pcs-xpcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)