Commit c1f33442 authored by Liad Kaufman's avatar Liad Kaufman Committed by Luca Coelho
Browse files

iwlwifi: memcpy from dev_cmd and not dev_cmd->hdr 



Klocwork complains about copying from dev_cmd->hdr if
copying more than 4 bytes since it means part of the
copy is from the next field. This isn't a real bug,
but for not failing Klocwork next time - fix this.

Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 162b22c9

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c

+2 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx_amsdu(struct iwl_trans *trans, 
		goto out_err;



	/* building the A-MSDU might have changed this data, memcpy it now */

	memcpy(&txq->first_tb_bufs[idx], &dev_cmd->hdr, IWL_FIRST_TB_SIZE);

	memcpy(&txq->first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);

	return tfd;



out_err:
@@ -473,7 +473,7 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struct iwl_trans *trans, 
	tb_phys = iwl_pcie_get_first_tb_dma(txq, idx);



	/* The first TB points to bi-directional DMA data */

	memcpy(&txq->first_tb_bufs[idx], &dev_cmd->hdr, IWL_FIRST_TB_SIZE);

	memcpy(&txq->first_tb_bufs[idx], dev_cmd, IWL_FIRST_TB_SIZE);



	iwl_pcie_gen2_set_tb(trans, tfd, tb_phys, IWL_FIRST_TB_SIZE);

drivers/net/wireless/intel/iwlwifi/pcie/tx.c

+1 −2
Original line number Diff line number Diff line
@@ -2438,8 +2438,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	}



	/* building the A-MSDU might have changed this data, so memcpy it now */

	memcpy(&txq->first_tb_bufs[txq->write_ptr], &dev_cmd->hdr,

	       IWL_FIRST_TB_SIZE);

	memcpy(&txq->first_tb_bufs[txq->write_ptr], dev_cmd, IWL_FIRST_TB_SIZE);



	tfd = iwl_pcie_get_tfd(trans, txq, txq->write_ptr);

	/* Set up entry for this TFD in Tx byte-count array */