| Message ID | 20220214021747.4976-18-damien.lemoal@opensource.wdc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | libsas and pm8001 fixes | expand |
On 14/02/2022 02:17, Damien Le Moal wrote: > In mpi_set_phy_profile_req() and in pm8001_set_phy_profile_single(), if > pm8001_tag_alloc() fails to allocate a new tag, a warning message is > issued but the uninitialized tag variable is still used to build a > command. Avoid this by returning early in case of tag allocation > failure. > > Also make sure to always return the error code returned by > pm8001_tag_alloc() when this function fails instead of an arbitrary > value. > > Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Reviewed-by: John Garry <john.garry@huawei.com> > --- > drivers/scsi/pm8001/pm80xx_hwi.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c > index 413b01cc2a84..b0b6dc643916 100644 > --- a/drivers/scsi/pm8001/pm80xx_hwi.c > +++ b/drivers/scsi/pm8001/pm80xx_hwi.c > @@ -1191,7 +1191,7 @@ pm80xx_set_thermal_config(struct pm8001_hba_info *pm8001_ha) > memset(&payload, 0, sizeof(struct set_ctrl_cfg_req)); > rc = pm8001_tag_alloc(pm8001_ha, &tag); > if (rc) > - return -1; > + return rc; > > circularQ = &pm8001_ha->inbnd_q_tbl[0]; > payload.tag = cpu_to_le32(tag); > @@ -1240,7 +1240,7 @@ pm80xx_set_sas_protocol_timer_config(struct pm8001_hba_info *pm8001_ha) jfyi, please note this: https://lore.kernel.org/linux-scsi/PH0PR11MB5112D8C17D9EA268C197893FEC579@PH0PR11MB5112.namprd11.prod.outlook.com/ > rc = pm8001_tag_alloc(pm8001_ha, &tag); > > if (rc) > - return -1; > + return rc; > > circularQ = &pm8001_ha->inbnd_q_tbl[0]; > payload.tag = cpu_to_le32(tag); > @@ -1398,7 +1398,7 @@ static int pm80xx_encrypt_update(struct pm8001_hba_info *pm8001_ha) > memset(&payload, 0, sizeof(struct kek_mgmt_req)); > rc = pm8001_tag_alloc(pm8001_ha, &tag); > if (rc) > - return -1; > + return rc; > > circularQ = &pm8001_ha->inbnd_q_tbl[0]; > payload.tag = cpu_to_le32(tag); > @@ -4979,8 +4979,11 @@ static void mpi_set_phy_profile_req(struct pm8001_hba_info *pm8001_ha, > > memset(&payload, 0, sizeof(payload)); > rc = pm8001_tag_alloc(pm8001_ha, &tag); > - if (rc) > + if (rc) { > pm8001_dbg(pm8001_ha, FAIL, "Invalid tag\n"); ha - it was originally just continuing regardless > + return; > + } > + > circularQ = &pm8001_ha->inbnd_q_tbl[0]; > payload.tag = cpu_to_le32(tag); > payload.ppc_phyid = > @@ -5022,8 +5025,10 @@ void pm8001_set_phy_profile_single(struct pm8001_hba_info *pm8001_ha, > memset(&payload, 0, sizeof(payload)); > > rc = pm8001_tag_alloc(pm8001_ha, &tag); > - if (rc) and here > + if (rc) { > pm8001_dbg(pm8001_ha, INIT, "Invalid tag\n"); > + return; > + } > > circularQ = &pm8001_ha->inbnd_q_tbl[0]; > opc = OPC_INB_SET_PHY_PROFILE;
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 413b01cc2a84..b0b6dc643916 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -1191,7 +1191,7 @@ pm80xx_set_thermal_config(struct pm8001_hba_info *pm8001_ha) memset(&payload, 0, sizeof(struct set_ctrl_cfg_req)); rc = pm8001_tag_alloc(pm8001_ha, &tag); if (rc) - return -1; + return rc; circularQ = &pm8001_ha->inbnd_q_tbl[0]; payload.tag = cpu_to_le32(tag); @@ -1240,7 +1240,7 @@ pm80xx_set_sas_protocol_timer_config(struct pm8001_hba_info *pm8001_ha) rc = pm8001_tag_alloc(pm8001_ha, &tag); if (rc) - return -1; + return rc; circularQ = &pm8001_ha->inbnd_q_tbl[0]; payload.tag = cpu_to_le32(tag); @@ -1398,7 +1398,7 @@ static int pm80xx_encrypt_update(struct pm8001_hba_info *pm8001_ha) memset(&payload, 0, sizeof(struct kek_mgmt_req)); rc = pm8001_tag_alloc(pm8001_ha, &tag); if (rc) - return -1; + return rc; circularQ = &pm8001_ha->inbnd_q_tbl[0]; payload.tag = cpu_to_le32(tag); @@ -4979,8 +4979,11 @@ static void mpi_set_phy_profile_req(struct pm8001_hba_info *pm8001_ha, memset(&payload, 0, sizeof(payload)); rc = pm8001_tag_alloc(pm8001_ha, &tag); - if (rc) + if (rc) { pm8001_dbg(pm8001_ha, FAIL, "Invalid tag\n"); + return; + } + circularQ = &pm8001_ha->inbnd_q_tbl[0]; payload.tag = cpu_to_le32(tag); payload.ppc_phyid = @@ -5022,8 +5025,10 @@ void pm8001_set_phy_profile_single(struct pm8001_hba_info *pm8001_ha, memset(&payload, 0, sizeof(payload)); rc = pm8001_tag_alloc(pm8001_ha, &tag); - if (rc) + if (rc) { pm8001_dbg(pm8001_ha, INIT, "Invalid tag\n"); + return; + } circularQ = &pm8001_ha->inbnd_q_tbl[0]; opc = OPC_INB_SET_PHY_PROFILE;
In mpi_set_phy_profile_req() and in pm8001_set_phy_profile_single(), if pm8001_tag_alloc() fails to allocate a new tag, a warning message is issued but the uninitialized tag variable is still used to build a command. Avoid this by returning early in case of tag allocation failure. Also make sure to always return the error code returned by pm8001_tag_alloc() when this function fails instead of an arbitrary value. Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> --- drivers/scsi/pm8001/pm80xx_hwi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)