xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fsl/fman: Check for null pointer after calling devm_ioremap

Browse Source 
[ Upstream commit d5a73ec96cc57cf67e51b12820fc2354e7ca46f8 ]

As the possible failure of the allocation, the devm_ioremap() may return
NULL pointer.
Take tgec_initialization() as an example.
If allocation fails, the params->base_addr will be NULL pointer and will
be assigned to tgec->regs in tgec_config().
Then it will cause the dereference of NULL pointer in set_mac_address(),
which is called by tgec_init().
Therefore, it should be better to add the sanity check after the calling
of the devm_ioremap().

Fixes: 3933961682 ("fsl/fman: Add FMan MAC driver")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jiasheng Jiang
2022-01-06 18:04:10 +08:00
committed by Greg Kroah-Hartman
parent 60aca6fdc1
commit f5e4f68d57
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/freescale/fman/mac.c
View File

@@ -94,7 +94,7 @@ static void mac_exception(void *handle, enum fman_mac_exceptions ex)
__func__, ex); __func__, ex);
} }
static void set_fman_mac_params(struct mac_device *mac_dev, static int set_fman_mac_params(struct mac_device *mac_dev,
struct fman_mac_params *params) struct fman_mac_params *params)
{ {
struct mac_priv_s *priv = mac_dev->priv; struct mac_priv_s *priv = mac_dev->priv;
@@ -102,6 +102,9 @@ static void set_fman_mac_params(struct mac_device *mac_dev,
params->base_addr = (typeof(params->base_addr)) params->base_addr = (typeof(params->base_addr))
devm_ioremap(priv->dev, mac_dev->res->start, devm_ioremap(priv->dev, mac_dev->res->start,
resource_size(mac_dev->res)); resource_size(mac_dev->res));
if (!params->base_addr)
return -ENOMEM;
memcpy(&params->addr, mac_dev->addr, sizeof(mac_dev->addr)); memcpy(&params->addr, mac_dev->addr, sizeof(mac_dev->addr));
params->max_speed = priv->max_speed; params->max_speed = priv->max_speed;
params->phy_if = mac_dev->phy_if; params->phy_if = mac_dev->phy_if;
@@ -112,6 +115,8 @@ static void set_fman_mac_params(struct mac_device *mac_dev,
params->event_cb = mac_exception; params->event_cb = mac_exception;
params->dev_id = mac_dev; params->dev_id = mac_dev;
params->internal_phy_node = priv->internal_phy_node; params->internal_phy_node = priv->internal_phy_node;
return 0;
} }
static int tgec_initialization(struct mac_device *mac_dev) static int tgec_initialization(struct mac_device *mac_dev)
@@ -123,7 +128,9 @@ static int tgec_initialization(struct mac_device *mac_dev)
priv = mac_dev->priv; priv = mac_dev->priv;
set_fman_mac_params(mac_dev, &params); err = set_fman_mac_params(mac_dev, &params);
if (err)
goto _return;
mac_dev->fman_mac = tgec_config(&params); mac_dev->fman_mac = tgec_config(&params);
if (!mac_dev->fman_mac) { if (!mac_dev->fman_mac) {
@@ -169,7 +176,9 @@ static int dtsec_initialization(struct mac_device *mac_dev)
priv = mac_dev->priv; priv = mac_dev->priv;
set_fman_mac_params(mac_dev, &params); err = set_fman_mac_params(mac_dev, &params);
if (err)
goto _return;
mac_dev->fman_mac = dtsec_config(&params); mac_dev->fman_mac = dtsec_config(&params);
if (!mac_dev->fman_mac) { if (!mac_dev->fman_mac) {
@@ -218,7 +227,9 @@ static int memac_initialization(struct mac_device *mac_dev)
priv = mac_dev->priv; priv = mac_dev->priv;
set_fman_mac_params(mac_dev, &params); err = set_fman_mac_params(mac_dev, &params);
if (err)
goto _return;
if (priv->max_speed == SPEED_10000) if (priv->max_speed == SPEED_10000)
params.phy_if = PHY_INTERFACE_MODE_XGMII; params.phy_if = PHY_INTERFACE_MODE_XGMII;