From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maciej Fijalkowski Date: Fri, 31 Jan 2020 11:15:43 +0100 Subject: [Intel-wired-lan] [PATCH net] ice: Fix a couple off by one bugs In-Reply-To: <20200131045658.ahliv7jvubpwoeru@kili.mountain> References: <20200131045658.ahliv7jvubpwoeru@kili.mountain> Message-ID: <20200131101543.GA4872@ranger.igk.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: On Fri, Jan 31, 2020 at 07:56:59AM +0300, Dan Carpenter wrote: > The hw->blk[blk]->es.ref_count[] array has hw->blk[blk].es.count > elements. It gets allocated in ice_init_hw_tbls(). So the > should be > >= to prevent accessing one element beyond the end of the array. > > Fixes: 2c61054c5fda ("ice: Optimize table usage") You should also provide: Fixes: 31ad4e4ee1e4 ("ice: Allocate flow profile") prof_id can be 0 so thanks for catching this. You can take my: Acked-by: Maciej Fijalkowski > Signed-off-by: Dan Carpenter > --- > drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c > index 99208946224c..38a7041fe774 100644 > --- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c > +++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c > @@ -1950,7 +1950,7 @@ ice_free_prof_id(struct ice_hw *hw, enum ice_block blk, u8 prof_id) > static enum ice_status > ice_prof_inc_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id) > { > - if (prof_id > hw->blk[blk].es.count) > + if (prof_id >= hw->blk[blk].es.count) > return ICE_ERR_PARAM; > > hw->blk[blk].es.ref_count[prof_id]++; > @@ -1991,7 +1991,7 @@ ice_write_es(struct ice_hw *hw, enum ice_block blk, u8 prof_id, > static enum ice_status > ice_prof_dec_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id) > { > - if (prof_id > hw->blk[blk].es.count) > + if (prof_id >= hw->blk[blk].es.count) > return ICE_ERR_PARAM; > > if (hw->blk[blk].es.ref_count[prof_id] > 0) { > -- > 2.11.0 >