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, 14 Aug 2018 10:05:03 -0700 (PDT)
Message-Id: <20180814.100503.1519932338963499861.davem@davemloft.net>
To:     jcline@redhat.com
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        jpoimboe@redhat.com, konrad.wilk@oracle.com, jamie.iles@oracle.com,
        liran.alon@oracle.com, stable@vger.kernel.org
Subject: Re: [PATCH] net: sock_diag: Fix spectre v1 gadget in
 __sock_diag_cmd()
From:   David Miller <davem@davemloft.net>
In-Reply-To: <20180813222313.3510-1-jcline@redhat.com>
References: <20180813222313.3510-1-jcline@redhat.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 13 Aug 2018 22:23:13 +0000

> req->sdiag_family is a user-controlled value that's used as an array
> index. Sanitize it after the bounds check to avoid speculative
> out-of-bounds array access.
> 
> This also protects the sock_is_registered() call, so this removes the
> sanitize call there.
> 
> Fixes: e978de7a6d38 ("net: socket: Fix potential spectre v1 gadget in sock_is_registered")
> Cc: Josh Poimboeuf <jpoimboe@redhat.com>
> Cc: konrad.wilk@oracle.com
> Cc: jamie.iles@oracle.com
> Cc: liran.alon@oracle.com
> Cc: stable@vger.kernel.org
> Signed-off-by: Jeremy Cline <jcline@redhat.com>
> ---
> 
> Since commit e978de7a6d38 didn't apply cleanly to v4.14, this won't
> either since it reverts that change. To apply cleanly there, the change
> to sock_is_registered() needs to be dropped.

Applied, thank you.