diff options
author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-07-29 05:26:25 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-08-12 03:55:53 -0400 |
commit | 35a7d8045931d384c3d02f28287e0eb42d6038f4 (patch) | |
tree | e6140456a91e735605371a5b4c87febed55d9b6d | |
parent | f57e4fbdcc8f65b94d59ce5566c781c46a298c28 (diff) |
i40e: Cleaning up missing null-terminate in conjunction with strncpy
Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Tested-By: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 2ac8f45d7c19..871474f6fe62 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -4415,13 +4415,13 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) | |||
4415 | 4415 | ||
4416 | switch (vsi->back->hw.phy.link_info.link_speed) { | 4416 | switch (vsi->back->hw.phy.link_info.link_speed) { |
4417 | case I40E_LINK_SPEED_40GB: | 4417 | case I40E_LINK_SPEED_40GB: |
4418 | strncpy(speed, "40 Gbps", SPEED_SIZE); | 4418 | strlcpy(speed, "40 Gbps", SPEED_SIZE); |
4419 | break; | 4419 | break; |
4420 | case I40E_LINK_SPEED_10GB: | 4420 | case I40E_LINK_SPEED_10GB: |
4421 | strncpy(speed, "10 Gbps", SPEED_SIZE); | 4421 | strlcpy(speed, "10 Gbps", SPEED_SIZE); |
4422 | break; | 4422 | break; |
4423 | case I40E_LINK_SPEED_1GB: | 4423 | case I40E_LINK_SPEED_1GB: |
4424 | strncpy(speed, "1000 Mbps", SPEED_SIZE); | 4424 | strlcpy(speed, "1000 Mbps", SPEED_SIZE); |
4425 | break; | 4425 | break; |
4426 | default: | 4426 | default: |
4427 | break; | 4427 | break; |
@@ -4429,16 +4429,16 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) | |||
4429 | 4429 | ||
4430 | switch (vsi->back->hw.fc.current_mode) { | 4430 | switch (vsi->back->hw.fc.current_mode) { |
4431 | case I40E_FC_FULL: | 4431 | case I40E_FC_FULL: |
4432 | strncpy(fc, "RX/TX", FC_SIZE); | 4432 | strlcpy(fc, "RX/TX", FC_SIZE); |
4433 | break; | 4433 | break; |
4434 | case I40E_FC_TX_PAUSE: | 4434 | case I40E_FC_TX_PAUSE: |
4435 | strncpy(fc, "TX", FC_SIZE); | 4435 | strlcpy(fc, "TX", FC_SIZE); |
4436 | break; | 4436 | break; |
4437 | case I40E_FC_RX_PAUSE: | 4437 | case I40E_FC_RX_PAUSE: |
4438 | strncpy(fc, "RX", FC_SIZE); | 4438 | strlcpy(fc, "RX", FC_SIZE); |
4439 | break; | 4439 | break; |
4440 | default: | 4440 | default: |
4441 | strncpy(fc, "None", FC_SIZE); | 4441 | strlcpy(fc, "None", FC_SIZE); |
4442 | break; | 4442 | break; |
4443 | } | 4443 | } |
4444 | 4444 | ||
@@ -5839,7 +5839,7 @@ static void i40e_send_version(struct i40e_pf *pf) | |||
5839 | dv.minor_version = DRV_VERSION_MINOR; | 5839 | dv.minor_version = DRV_VERSION_MINOR; |
5840 | dv.build_version = DRV_VERSION_BUILD; | 5840 | dv.build_version = DRV_VERSION_BUILD; |
5841 | dv.subbuild_version = 0; | 5841 | dv.subbuild_version = 0; |
5842 | strncpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string)); | 5842 | strlcpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string)); |
5843 | i40e_aq_send_driver_version(&pf->hw, &dv, NULL); | 5843 | i40e_aq_send_driver_version(&pf->hw, &dv, NULL); |
5844 | } | 5844 | } |
5845 | 5845 | ||