From mboxrd@z Thu Jan 1 00:00:00 1970 From: Edward Cree Subject: Re: [patch net-next] sfc: a couple off by one bugs Date: Wed, 1 Feb 2017 13:24:26 +0000 Message-ID: <60d163b6-0b49-172f-288c-e1712e04a84e@solarflare.com> References: <20170201085040.GA31514@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Bert Kenward , , To: Dan Carpenter , Solarflare linux maintainers Return-path: Received: from nbfkord-smmo03.seg.att.com ([209.65.160.84]:40738 "EHLO nbfkord-smmo03.seg.att.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbdBANYf (ORCPT ); Wed, 1 Feb 2017 08:24:35 -0500 In-Reply-To: <20170201085040.GA31514@mwanda> Sender: netdev-owner@vger.kernel.org List-ID: On 01/02/17 08:50, Dan Carpenter wrote: > These checks are off by one. These are just sanity checks and we don't > ever pass invalid values for "encap_type" so it's harmless. > > Fixes: 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic") > Signed-off-by: Dan Carpenter One of these was already fixed by Colin Ian King in e9904990e8e70a51574e6ec6b872f3c705ec75f0 ("sfc: fix an off-by-one compare on an array size"). For the other one: Acked-by: Edward Cree > diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c > index 8bec9383d754..dec0c8083ff3 100644 > --- a/drivers/net/ethernet/sfc/ef10.c > +++ b/drivers/net/ethernet/sfc/ef10.c > @@ -5080,7 +5080,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx, > > /* quick bounds check (BCAST result impossible) */ > BUILD_BUG_ON(EFX_EF10_BCAST != 0); > - if (encap_type > ARRAY_SIZE(map) || map[encap_type] == 0) { > + if (encap_type >= ARRAY_SIZE(map) || map[encap_type] == 0) { > WARN_ON(1); > return -EINVAL; > } > @@ -5134,7 +5134,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx, > > /* quick bounds check (BCAST result impossible) */ > BUILD_BUG_ON(EFX_EF10_BCAST != 0); > - if (encap_type > ARRAY_SIZE(map) || map[encap_type] == 0) { > + if (encap_type >= ARRAY_SIZE(map) || map[encap_type] == 0) { > WARN_ON(1); > return -EINVAL; > }