diff options
| author | Kory Maincent <[email protected]> | 2024-07-11 13:55:19 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-07-14 14:16:18 +0000 |
| commit | 4cddb0f15ea9c62f81b4889ea69a99368cc63a86 (patch) | |
| tree | af0f2c5ccbe2c5e5dde3a9b4479939079c95f3d0 | |
| parent | net: pse-pd: Do not return EOPNOSUPP if config is null (diff) | |
| download | kernel-4cddb0f15ea9c62f81b4889ea69a99368cc63a86.tar.gz kernel-4cddb0f15ea9c62f81b4889ea69a99368cc63a86.zip | |
net: ethtool: pse-pd: Fix possible null-deref
Fix a possible null dereference when a PSE supports both c33 and PoDL, but
only one of the netlink attributes is specified. The c33 or PoDL PSE
capabilities are already validated in the ethnl_set_pse_validate() call.
Signed-off-by: Kory Maincent <[email protected]>
Reported-by: Jakub Kicinski <[email protected]>
Closes: https://lore.kernel.org/netdev/[email protected]/
Fixes: 4d18e3ddf427 ("net: ethtool: pse-pd: Expand pse commands with the PSE PoE interface")
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | net/ethtool/pse-pd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index 982995ff1628..776ac96cdadc 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -178,9 +178,9 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) phydev = dev->phydev; /* These values are already validated by the ethnl_pse_set_policy */ - if (pse_has_podl(phydev->psec)) + if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]) config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); - if (pse_has_c33(phydev->psec)) + if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]) config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]); /* Return errno directly - PSE has no notification |