| Message ID | 20231211031336.235634-1-chentao@kylinos.cn (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | igb: Add null pointer check to igb_set_fw_version | expand |
On Mon, 11 Dec 2023 11:13:36 +0800 Kunwu Chan wrote: > kasprintf() returns a pointer to dynamically allocated memory > which can be NULL upon failure. > > Fixes: 1978d3ead82c ("intel: fix string truncation warnings") > Cc: Kunwu Chan <kunwu.chan@hotmail.com> > Signed-off-by: Kunwu Chan <chentao@kylinos.cn> The allocation is rather pointless here. Can you convert this code to use snprintf() instead?
Thanks for your reply. I'll try to use snprintf in v2 patch. On 2023/12/13 05:26, Jakub Kicinski wrote: > On Mon, 11 Dec 2023 11:13:36 +0800 Kunwu Chan wrote: >> kasprintf() returns a pointer to dynamically allocated memory >> which can be NULL upon failure. >> >> Fixes: 1978d3ead82c ("intel: fix string truncation warnings") >> Cc: Kunwu Chan <kunwu.chan@hotmail.com> >> Signed-off-by: Kunwu Chan <chentao@kylinos.cn> > > The allocation is rather pointless here. > Can you convert this code to use snprintf() instead?
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b2295caa2f0a..6838f6fccb80 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3102,6 +3102,8 @@ void igb_set_fw_version(struct igb_adapter *adapter) break; } + if (!lbuf) + return; /* the truncate happens here if it doesn't fit */ strscpy(adapter->fw_version, lbuf, sizeof(adapter->fw_version)); kfree(lbuf);
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Fixes: 1978d3ead82c ("intel: fix string truncation warnings") Cc: Kunwu Chan <kunwu.chan@hotmail.com> Signed-off-by: Kunwu Chan <chentao@kylinos.cn> --- drivers/net/ethernet/intel/igb/igb_main.c | 2 ++ 1 file changed, 2 insertions(+)