| Message ID | 20140109053400.GF1265@elgon.mountain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> I don't know how large "tp->vlan_shift" is but static checkers worry > about shift wrapping bugs here. Indeed. > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Dimitris Michailidis <dm@chelsio.com> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c > b/drivers/net/ethernet/chelsio/cxgb4/l2t.c > index cb05be905def..81e8402a74b4 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c > +++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c > @@ -423,7 +423,7 @@ u64 cxgb4_select_ntuple(struct net_device *dev, > * in the Compressed Filter Tuple. > */ > if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE) > - ntuple |= (F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; > + ntuple |= (u64)(F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; > > if (tp->port_shift >= 0) > ntuple |= (u64)l2t->lport << tp->port_shift; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 9 Jan 2014 08:34:00 +0300 > I don't know how large "tp->vlan_shift" is but static checkers worry > about shift wrapping bugs here. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied to 'net'. I don't think I'll be able to get this into 3.13, but on the off chance Linus has to do another -rc I'll try to send it to him. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c index cb05be905def..81e8402a74b4 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c +++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c @@ -423,7 +423,7 @@ u64 cxgb4_select_ntuple(struct net_device *dev, * in the Compressed Filter Tuple. */ if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE) - ntuple |= (F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; + ntuple |= (u64)(F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift; if (tp->port_shift >= 0) ntuple |= (u64)l2t->lport << tp->port_shift;
I don't know how large "tp->vlan_shift" is but static checkers worry about shift wrapping bugs here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html