Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 30 Jul 2019 21:28:01 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc:     Tony Luck <tony.luck@intel.com>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Leon Romanovsky <leon@kernel.org>,
        Parav Pandit <parav@mellanox.com>, linux-rdma@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] IB/core: Add mitigation for Spectre V1
Message-ID: <20190731042801.GA2179@iweiny-DESK2.sc.intel.com>
References: <20190730202407.31046-1-tony.luck@intel.com>
 <95f5cf70-1a1d-f48c-efac-f389360f585e@embeddedor.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <95f5cf70-1a1d-f48c-efac-f389360f585e@embeddedor.com>
User-Agent: Mutt/1.11.1 (2018-12-01)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Jul 30, 2019 at 06:52:12PM -0500, Gustavo A. R. Silva wrote:
> 
> 
> On 7/30/19 3:24 PM, Tony Luck wrote:
> > Some processors may mispredict an array bounds check and
> > speculatively access memory that they should not. With
> > a user supplied array index we like to play things safe
> > by masking the value with the array size before it is
> > used as an index.
> > 
> > Signed-off-by: Tony Luck <tony.luck@intel.com>
> > ---
> > 
> > [I don't have h/w, so just compile tested]
> > 
> >  drivers/infiniband/core/user_mad.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
> > index 9f8a48016b41..fdce254e4f65 100644
> > --- a/drivers/infiniband/core/user_mad.c
> > +++ b/drivers/infiniband/core/user_mad.c
> > @@ -49,6 +49,7 @@
> >  #include <linux/sched.h>
> >  #include <linux/semaphore.h>
> >  #include <linux/slab.h>
> > +#include <linux/nospec.h>
> >  
> >  #include <linux/uaccess.h>
> >  
> > @@ -888,6 +889,7 @@ static int ib_umad_unreg_agent(struct ib_umad_file *file, u32 __user *arg)
> >  	mutex_lock(&file->port->file_mutex);
> >  	mutex_lock(&file->mutex);
> >  
> > +	id = array_index_nospec(id, IB_UMAD_MAX_AGENTS);
> 
> This is wrong. This prevents the below condition id >= IB_UMAD_MAX_AGENTS
> from ever being true. And I don't think this is what you want.

Ah Yea...  FWIW this would probably never be hit.

Tony; split the check?

	if (id >= IB_UMAD_MAX_AGENTS) {
		ret = -EINVAL;
		goto out;
	}

	id = array_index_nospec(id, IB_UMAD_MAX_AGENTS);

	if (!__get_agent(file, id)) {
		ret = -EINVAL;
		goto out;
	}

Ira

> 
> >  	if (id >= IB_UMAD_MAX_AGENTS || !__get_agent(file, id)) {
> >  		ret = -EINVAL;
> >  		goto out;
> > 
> 
> --
> Gustavo