| Message ID | 20240816082239.4188902-1-kniv@yandex-team.ru (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | cxgb4: add forgotten u64 ivlan cast before shift | expand |
On Fri, Aug 16, 2024 at 11:22:39AM +0300, Nikolay Kuratov wrote: > It is done everywhere in cxgb4 code, e.g. in is_filter_exact_match() > There is no reason it should not be done here > > Found by Linux Verification Center (linuxtesting.org) with SVACE > > Signed-off-by: Nikolay Kuratov <kniv@yandex-team.ru> > Cc: stable@vger.kernel.org > Fixes: 12b276fbf6e0 ("cxgb4: add support to create hash filters") > --- > drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c > index 786ceae34488..e417ff0ea06c 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c > @@ -1244,7 +1244,7 @@ static u64 hash_filter_ntuple(struct ch_filter_specification *fs, > * in the Compressed Filter Tuple. > */ > if (tp->vlan_shift >= 0 && fs->mask.ivlan) > - ntuple |= (FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift; > + ntuple |= (u64)(FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift; LGTM, but please line wrap this so that it doesn't extend beyond 80 columns wide (as is the case elsewhere in this function). > > if (tp->port_shift >= 0 && fs->mask.iport) > ntuple |= (u64)fs->val.iport << tp->port_shift;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c index 786ceae34488..e417ff0ea06c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c @@ -1244,7 +1244,7 @@ static u64 hash_filter_ntuple(struct ch_filter_specification *fs, * in the Compressed Filter Tuple. */ if (tp->vlan_shift >= 0 && fs->mask.ivlan) - ntuple |= (FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift; + ntuple |= (u64)(FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift; if (tp->port_shift >= 0 && fs->mask.iport) ntuple |= (u64)fs->val.iport << tp->port_shift;
It is done everywhere in cxgb4 code, e.g. in is_filter_exact_match() There is no reason it should not be done here Found by Linux Verification Center (linuxtesting.org) with SVACE Signed-off-by: Nikolay Kuratov <kniv@yandex-team.ru> Cc: stable@vger.kernel.org Fixes: 12b276fbf6e0 ("cxgb4: add support to create hash filters") --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)