redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

cxgb3: avoid needless buffer copy for firmware 

There's no reason to perform a buffer copy for the firmware name. This
also avoids a (currently impossible with current callers) NULL dereference
if there was no matching firmware.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Kees Cook 2015-06-16 15:36:17 -07:00 committed by David S. Miller
parent a55e1c5c26
commit 92a486ca3a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
View File

@ -1025,19 +1025,19 @@ int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size)
{
struct adapter *adapter = phy->adapter;
const struct firmware *fw;
char buf[64];
const char *fw_name;
u32 csum;
const __be32 *p;
u16 *cache = phy->phy_cache;
int i, ret;
int i, ret = -EINVAL;
snprintf(buf, sizeof(buf), get_edc_fw_name(edc_idx));
ret = request_firmware(&fw, buf, &adapter->pdev->dev);
fw_name = get_edc_fw_name(edc_idx);
if (fw_name)
ret = request_firmware(&fw, fw_name, &adapter->pdev->dev);
if (ret < 0) {
dev_err(&adapter->pdev->dev,
"could not upgrade firmware: unable to load %s\n",
buf);
fw_name);
return ret;
}