Date:   Sat, 1 Jan 2022 11:54:29 +0000
From:   Martin Habets <habetsm.xilinx@gmail.com>
To:     Pavel Machek <pavel@denx.de>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Jiasheng Jiang <jiasheng@iscas.ac.cn>,
        Jakub Kicinski <kuba@kernel.org>,
        Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.10 26/76] sfc: Check null pointer of rx_queue->page_ring
Message-ID: <20220101115428.5mxenvq5k2cmzjlt@gmail.com>
Mail-Followup-To: Pavel Machek <pavel@denx.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Jiasheng Jiang <jiasheng@iscas.ac.cn>,
        Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>
References: <20211227151324.694661623@linuxfoundation.org>
 <20211227151325.595242432@linuxfoundation.org>
 <20211229111730.GB25195@amd>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211229111730.GB25195@amd>
User-Agent: NeoMutt/20170113 (1.7.2)
Precedence: bulk

On Wed, Dec 29, 2021 at 12:17:30PM +0100, Pavel Machek wrote:
> hi!
> 
> > From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> > 
> > [ Upstream commit bdf1b5c3884f6a0dc91b0dbdb8c3b7d205f449e0 ]
> > 
> > Because of the possible failure of the kcalloc, it should be better to
> > set rx_queue->page_ptr_mask to 0 when it happens in order to maintain
> > the consistency.
> 
> This is confusing/wrong, or at least not a complete fix.
> 
> > +++ b/drivers/net/ethernet/sfc/rx_common.c
> > @@ -150,7 +150,10 @@ static void efx_init_rx_recycle_ring(struct efx_rx_queue *rx_queue)
> >  					    efx->rx_bufs_per_page);
> >  	rx_queue->page_ring = kcalloc(page_ring_size,
> >  				      sizeof(*rx_queue->page_ring), GFP_KERNEL);
> > -	rx_queue->page_ptr_mask = page_ring_size - 1;
> > +	if (!rx_queue->page_ring)
> > +		rx_queue->page_ptr_mask = 0;
> > +	else
> > +		rx_queue->page_ptr_mask = page_ring_size - 1;
> >  }
> >  
> 
> So we have !rx_queue->page_ring. But in efx_reuse_page, we do
> 
>         index = rx_queue->page_remove & rx_queue->page_ptr_mask;
> 	page = rx_queue->page_ring[index];
> 
> So index is now zero, but we'll derefernce null pointer anyway.

Good point. I've posted a patch for this to netdev.
https://lore.kernel.org/netdev/164103678041.26263.8354809911405746465.stgit@palantir17.mph.net/

Thanks,
Martin