From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CA1EC43387 for ; Thu, 20 Dec 2018 09:23:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED60C2177B for ; Thu, 20 Dec 2018 09:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297806; bh=23bxm9obxe0ltb9H6OShz6agAU/Bwp5KvrE+sgaBJc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=poZTen7LIWA10l6vagT0j+c+lwIYCWFi5Ofi7G3xpE0mclOEWZkN5LkG0HEx3rg+Y 144vOPK3c6ODozErusT4D695a0WFlI3ZOZgyoo1wo+okYTwzCGr38xOwqg1N+N1Fwp MmY8cmYnllKTWgVhVwoOdMu5rJmz1mEngY241AkM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731529AbeLTJXY (ORCPT ); Thu, 20 Dec 2018 04:23:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:52756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731509AbeLTJXV (ORCPT ); Thu, 20 Dec 2018 04:23:21 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BCE25217D7; Thu, 20 Dec 2018 09:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297801; bh=23bxm9obxe0ltb9H6OShz6agAU/Bwp5KvrE+sgaBJc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dbz8QHWe3BFdqQeXDAHBmza7KD58IgeMNZJXM0XyrBd5GT0ybbHr6PGN0KraSLhSz C1jFUF4GnvTGEgk3cD6LyepM+a7e2YIFo9KqJadQjjswhBkKu1bQTErR81wu/VDqDz g7+7Kqi0GGvXdEqCqAESrBuvnCnQalBC7LWPgTQU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Wilcox , Dan Carpenter , Jeff Moyer , Jens Axboe Subject: [PATCH 4.9 09/61] aio: fix spectre gadget in lookup_ioctx Date: Thu, 20 Dec 2018 10:18:09 +0100 Message-Id: <20181220085844.103038300@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085843.743900603@linuxfoundation.org> References: <20181220085843.743900603@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Moyer commit a538e3ff9dabcdf6c3f477a373c629213d1c3066 upstream. Matthew pointed out that the ioctx_table is susceptible to spectre v1, because the index can be controlled by an attacker. The below patch should mitigate the attack for all of the aio system calls. Cc: stable@vger.kernel.org Reported-by: Matthew Wilcox Reported-by: Dan Carpenter Signed-off-by: Jeff Moyer Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/aio.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/aio.c +++ b/fs/aio.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -1071,6 +1072,7 @@ static struct kioctx *lookup_ioctx(unsig if (!table || id >= table->nr) goto out; + id = array_index_nospec(id, table->nr); ctx = rcu_dereference(table->table[id]); if (ctx && ctx->user_id == ctx_id) { if (percpu_ref_tryget_live(&ctx->users))