[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0b4d9292-cf0a-170e-a85a-527d1481ae51@cogentembedded.com>
Date: Sat, 6 Jan 2018 13:06:28 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Dan Williams <dan.j.williams@...el.com>,
linux-kernel@...r.kernel.org
Cc: linux-arch@...r.kernel.org, peterz@...radead.org,
netdev@...r.kernel.org,
"Eric W. Biederman" <ebiederm@...ssion.com>,
gregkh@...uxfoundation.org, tglx@...utronix.de,
torvalds@...ux-foundation.org,
"David S. Miller" <davem@...emloft.net>,
Elena Reshetova <elena.reshetova@...el.com>,
alan@...ux.intel.com
Subject: Re: [PATCH 16/18] net: mpls: prevent bounds-check bypass via
speculative execution
On 1/6/2018 4:11 AM, Dan Williams wrote:
> Static analysis reports that 'index' may be a user controlled value that
> is used as a data dependency reading 'rt' from the 'platform_label'
> array. In order to avoid potential leaks of kernel memory values, block
> speculative execution of the instruction stream that could issue further
> reads based on an invalid 'rt' value.
>
> Based on an original patch by Elena Reshetova.
>
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: Eric W. Biederman <ebiederm@...ssion.com>
> Cc: netdev@...r.kernel.org
> Signed-off-by: Elena Reshetova <elena.reshetova@...el.com>
> Signed-off-by: Dan Williams <dan.j.williams@...el.com>
> ---
> net/mpls/af_mpls.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
> index 8ca9915befc8..ebcf0e246cfe 100644
> --- a/net/mpls/af_mpls.c
> +++ b/net/mpls/af_mpls.c
[...]
> @@ -77,12 +78,13 @@ static void rtmsg_lfib(int event, u32 label, struct mpls_route *rt,
> static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index)
> {
> struct mpls_route *rt = NULL;
> + struct mpls_route __rcu **platform_label =
> + rcu_dereference(net->mpls.platform_label);
> + struct mpls_route __rcu **rtp;
>
> - if (index < net->mpls.platform_labels) {
> - struct mpls_route __rcu **platform_label =
> - rcu_dereference(net->mpls.platform_label);
> - rt = rcu_dereference(platform_label[index]);
> - }
> + if ((rtp = nospec_array_ptr(platform_label, index,
And here...
> + net->mpls.platform_labels)))
> + rt = rcu_dereference(*rtp);
> return rt;
> }
>
MBR, Sergei
Powered by blists - more mailing lists