Commit c56d0558 authored by Kunwu Chan's avatar Kunwu Chan Committed by Tony Nguyen
Browse files

igb: Fix string truncation warnings in igb_set_fw_version 



Commit 1978d3ea ("intel: fix string truncation warnings")
fixes '-Wformat-truncation=' warnings in igb_main.c by using kasprintf.

drivers/net/ethernet/intel/igb/igb_main.c:3092:53: warning：‘%d’ directive output may be truncated writing between 1 and 5 bytes into a region of size between 1 and 13 [-Wformat-truncation=]
 3092 |                                  "%d.%d, 0x%08x, %d.%d.%d",
      |                                                     ^~
drivers/net/ethernet/intel/igb/igb_main.c:3092:34: note：directive argument in the range [0, 65535]
 3092 |                                  "%d.%d, 0x%08x, %d.%d.%d",
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/intel/igb/igb_main.c:3092:34: note：directive argument in the range [0, 65535]
drivers/net/ethernet/intel/igb/igb_main.c:3090:25: note：‘snprintf’ output between 23 and 43 bytes into a destination of size 32

kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure.

Fix this warning by using a larger space for adapter->fw_version,
and then fall back and continue to use snprintf.

Fixes: 1978d3ea ("intel: fix string truncation warnings")
Signed-off-by: default avatarKunwu Chan <chentao@kylinos.cn>
Cc: Kunwu Chan <kunwu.chan@hotmail.com>
Suggested-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9b23fceb

drivers/net/ethernet/intel/igb/igb.h

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ struct igb_adapter { 
		struct timespec64 period;

	} perout[IGB_N_PEROUT];



	char fw_version[32];

	char fw_version[48];

#ifdef CONFIG_IGB_HWMON

	struct hwmon_buff *igb_hwmon_buff;

	bool ets;

drivers/net/ethernet/intel/igb/igb_main.c

+18 −17
Original line number Diff line number Diff line
@@ -3069,7 +3069,6 @@ void igb_set_fw_version(struct igb_adapter *adapter) 
{

	struct e1000_hw *hw = &adapter->hw;

	struct e1000_fw_version fw;

	char *lbuf;



	igb_get_fw_version(hw, &fw);
@@ -3077,7 +3076,9 @@ void igb_set_fw_version(struct igb_adapter *adapter) 
	case e1000_i210:

	case e1000_i211:

		if (!(igb_get_flash_presence_i210(hw))) {

			lbuf = kasprintf(GFP_KERNEL, "%2d.%2d-%d",

			snprintf(adapter->fw_version,

				 sizeof(adapter->fw_version),

				 "%2d.%2d-%d",

				 fw.invm_major, fw.invm_minor,

				 fw.invm_img_type);

			break;
@@ -3086,25 +3087,25 @@ void igb_set_fw_version(struct igb_adapter *adapter) 
	default:

		/* if option rom is valid, display its version too */

		if (fw.or_valid) {

			lbuf = kasprintf(GFP_KERNEL, "%d.%d, 0x%08x, %d.%d.%d",

					 fw.eep_major, fw.eep_minor,

					 fw.etrack_id, fw.or_major, fw.or_build,

					 fw.or_patch);

			snprintf(adapter->fw_version,

				 sizeof(adapter->fw_version),

				 "%d.%d, 0x%08x, %d.%d.%d",

				 fw.eep_major, fw.eep_minor, fw.etrack_id,

				 fw.or_major, fw.or_build, fw.or_patch);

		/* no option rom */

		} else if (fw.etrack_id != 0X0000) {

			lbuf = kasprintf(GFP_KERNEL, "%d.%d, 0x%08x",

					 fw.eep_major, fw.eep_minor,

					 fw.etrack_id);

			snprintf(adapter->fw_version,

				 sizeof(adapter->fw_version),

				 "%d.%d, 0x%08x",

				 fw.eep_major, fw.eep_minor, fw.etrack_id);

		} else {

			lbuf = kasprintf(GFP_KERNEL, "%d.%d.%d", fw.eep_major,

					 fw.eep_minor, fw.eep_build);

			snprintf(adapter->fw_version,

				 sizeof(adapter->fw_version),

				 "%d.%d.%d",

				 fw.eep_major, fw.eep_minor, fw.eep_build);

		}

		break;

	}



	/* the truncate happens here if it doesn't fit */

	strscpy(adapter->fw_version, lbuf, sizeof(adapter->fw_version));

	kfree(lbuf);

}



/**