Skip to content

Commit 416dbb8

Browse files
2045geminigregkh
authored andcommitted
ice: Fix improper handling of refcount in ice_sriov_set_msix_vec_count()
commit d517cf8 upstream. This patch addresses an issue with improper reference count handling in the ice_sriov_set_msix_vec_count() function. First, the function calls ice_get_vf_by_id(), which increments the reference count of the vf pointer. If the subsequent call to ice_get_vf_vsi() fails, the function currently returns an error without decrementing the reference count of the vf pointer, leading to a reference count leak. The correct behavior, as implemented in this patch, is to decrement the reference count using ice_put_vf(vf) before returning an error when vsi is NULL. Second, the function calls ice_sriov_get_irqs(), which sets vf->first_vector_idx. If this call returns a negative value, indicating an error, the function returns an error without decrementing the reference count of the vf pointer, resulting in another reference count leak. The patch addresses this by adding a call to ice_put_vf(vf) before returning an error when vf->first_vector_idx < 0. This bug was identified by an experimental static analysis tool developed by our team. The tool specializes in analyzing reference count operations and identifying potential mismanagement of reference counts. In this case, the tool flagged the missing decrement operation as a potential issue, leading to this patch. Fixes: 4035c72 ("ice: reconfig host after changing MSI-X on VF") Fixes: 4d38cb4 ("ice: manage VFs MSI-X using resource tracking") Cc: stable@vger.kernel.org Signed-off-by: Gui-Dong Han <hanguidong02@outlook.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Rafal Romanowski <rafal.romanowski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent aefecea commit 416dbb8

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/net/ethernet/intel/ice/ice_sriov.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,10 @@ int ice_sriov_set_msix_vec_count(struct pci_dev *vf_dev, int msix_vec_count)
10961096
return -ENOENT;
10971097

10981098
vsi = ice_get_vf_vsi(vf);
1099-
if (!vsi)
1099+
if (!vsi) {
1100+
ice_put_vf(vf);
11001101
return -ENOENT;
1102+
}
11011103

11021104
prev_msix = vf->num_msix;
11031105
prev_queues = vf->num_vf_qs;
@@ -1145,8 +1147,10 @@ int ice_sriov_set_msix_vec_count(struct pci_dev *vf_dev, int msix_vec_count)
11451147
vf->num_msix = prev_msix;
11461148
vf->num_vf_qs = prev_queues;
11471149
vf->first_vector_idx = ice_sriov_get_irqs(pf, vf->num_msix);
1148-
if (vf->first_vector_idx < 0)
1150+
if (vf->first_vector_idx < 0) {
1151+
ice_put_vf(vf);
11491152
return -EINVAL;
1153+
}
11501154

11511155
if (needs_rebuild) {
11521156
vsi->req_txq = prev_queues;

0 commit comments

Comments
 (0)