moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qlcnic: prevent ->dcb use-after-free on qlcnic_dcb_enable() failure

Browse Source 
[ Upstream commit 13a7c8964afcd8ca43c0b6001ebb0127baa95362 ]

adapter->dcb would get silently freed inside qlcnic_dcb_enable() in
case qlcnic_dcb_attach() would return an error, which always happens
under OOM conditions. This would lead to use-after-free because both
of the existing callers invoke qlcnic_dcb_get_info() on the obtained
pointer, which is potentially freed at that point.

Propagate errors from qlcnic_dcb_enable(), and instead free the dcb
pointer at callsite using qlcnic_dcb_free(). This also removes the now
unused qlcnic_clear_dcb_ops() helper, which was a simple wrapper around
kfree() also causing memory leaks for partially initialized dcb.

Found by Linux Verification Center (linuxtesting.org) with the SVACE
static analysis tool.

Fixes: 3c44bba1d2 ("qlcnic: Disable DCB operations from SR-IOV VFs")
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Daniil Tatianin
2022-12-22 14:52:28 +03:00
committed by Greg Kroah-Hartman
parent 6c55953e23
commit 95df720e64
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
View File

@@ -2505,7 +2505,13 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
goto disable_mbx_intr; goto disable_mbx_intr;
qlcnic_83xx_clear_function_resources(adapter); qlcnic_83xx_clear_function_resources(adapter);
qlcnic_dcb_enable(adapter->dcb);
err = qlcnic_dcb_enable(adapter->dcb);
if (err) {
qlcnic_dcb_free(adapter->dcb);
goto disable_mbx_intr;
}
qlcnic_83xx_initialize_nic(adapter, 1); qlcnic_83xx_initialize_nic(adapter, 1);
qlcnic_dcb_get_info(adapter->dcb); qlcnic_dcb_get_info(adapter->dcb);

10
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h
View File

@@ -41,11 +41,6 @@ struct qlcnic_dcb {
unsigned long state; unsigned long state;
}; };
static inline void qlcnic_clear_dcb_ops(struct qlcnic_dcb *dcb)
{
kfree(dcb);
}
static inline int qlcnic_dcb_get_hw_capability(struct qlcnic_dcb *dcb) static inline int qlcnic_dcb_get_hw_capability(struct qlcnic_dcb *dcb)
{ {
if (dcb && dcb->ops->get_hw_capability) if (dcb && dcb->ops->get_hw_capability)
@@ -112,9 +107,8 @@ static inline void qlcnic_dcb_init_dcbnl_ops(struct qlcnic_dcb *dcb)
dcb->ops->init_dcbnl_ops(dcb); dcb->ops->init_dcbnl_ops(dcb);
} }
static inline void qlcnic_dcb_enable(struct qlcnic_dcb *dcb) static inline int qlcnic_dcb_enable(struct qlcnic_dcb *dcb)
{ {
if (dcb && qlcnic_dcb_attach(dcb)) return dcb ? qlcnic_dcb_attach(dcb) : 0;
qlcnic_clear_dcb_ops(dcb);
} }
#endif #endif

8
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View File

@@ -2616,7 +2616,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
"Device does not support MSI interrupts\n"); "Device does not support MSI interrupts\n");
if (qlcnic_82xx_check(adapter)) { if (qlcnic_82xx_check(adapter)) {
qlcnic_dcb_enable(adapter->dcb); err = qlcnic_dcb_enable(adapter->dcb);
if (err) {
qlcnic_dcb_free(adapter->dcb);
dev_err(&pdev->dev, "Failed to enable DCB\n");
goto err_out_free_hw;
}
qlcnic_dcb_get_info(adapter->dcb); qlcnic_dcb_get_info(adapter->dcb);
err = qlcnic_setup_intr(adapter); err = qlcnic_setup_intr(adapter);