From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Hannes Frederic Sowa <hannes@stressinduktion.org>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 08/14] i40e: fix sign extension issue
Date: Tue, 22 Oct 2013 07:22:31 -0700 [thread overview]
Message-ID: <1382451757-9817-9-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1382451757-9817-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
This is a fix for an issue reported by coverity, reported
by Hannes Frederic Sowa.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Hannes Frederic Sowa <hannes@stressinduktion.org>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index fbc40cd..8fc313c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -99,9 +99,9 @@ int i40e_program_fdir_filter(struct i40e_fdir_data *fdir_data,
<< I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT);
else
fdir_desc->qindex_flex_ptype_vsi |=
- cpu_to_le32((fdir_data->dest_vsi
- << I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT)
- & I40E_TXD_FLTR_QW0_DEST_VSI_MASK);
+ cpu_to_le32((((u32)fdir_data->dest_vsi) <<
+ I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT) &
+ I40E_TXD_FLTR_QW0_DEST_VSI_MASK);
fdir_desc->dtype_cmd_cntindex =
cpu_to_le32(I40E_TX_DESC_DTYPE_FILTER_PROG);
@@ -127,9 +127,9 @@ int i40e_program_fdir_filter(struct i40e_fdir_data *fdir_data,
fdir_desc->dtype_cmd_cntindex |=
cpu_to_le32(I40E_TXD_FLTR_QW1_CNT_ENA_MASK);
fdir_desc->dtype_cmd_cntindex |=
- cpu_to_le32((fdir_data->cnt_index
- << I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT)
- & I40E_TXD_FLTR_QW1_CNTINDEX_MASK);
+ cpu_to_le32((((u32)fdir_data->cnt_index) <<
+ I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &
+ I40E_TXD_FLTR_QW1_CNTINDEX_MASK);
}
fdir_desc->fd_id = cpu_to_le32(fdir_data->fd_id);
--
1.8.3.1
next prev parent reply other threads:[~2013-10-22 14:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 14:22 [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 01/14] i40e: do not flush after re-enabling interrupts Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 02/14] i40e: don't free nonexistent rings Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 03/14] i40e: assign correct vector to VF Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 04/14] i40e: fixup legacy interrupt handling Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 05/14] i40e: debugfs fixups Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 06/14] i40e: clamp debugfs nvm read command Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 07/14] i40e: fix use of untrusted scalar value warning Jeff Kirsher
2013-10-22 14:22 ` Jeff Kirsher [this message]
2013-10-22 14:22 ` [net-next v2 09/14] i40e: refactor fdir setup function Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 10/14] i40e: tweaking icr0 handling for legacy irq Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 11/14] i40e: reorder block declarations in debugfs Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 12/14] i40e: check vsi ptrs before dumping them Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 13/14] i40e: use pf_id for pf function id in qtx_ctl Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 14/14] i40e: Bump version Jeff Kirsher
2013-10-22 19:53 ` [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates David Miller
2013-10-22 20:00 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382451757-9817-9-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=hannes@stressinduktion.org \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).