From patchwork Fri Dec 14 16:47:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 10731501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79F5D6C5 for ; Fri, 14 Dec 2018 17:37:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C23F92CE46 for ; Fri, 14 Dec 2018 17:37:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5D892D034; Fri, 14 Dec 2018 17:37:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C2AD2CE46 for ; Fri, 14 Dec 2018 17:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729822AbeLNRhp (ORCPT ); Fri, 14 Dec 2018 12:37:45 -0500 Received: from gateway36.websitewelcome.com ([192.185.193.119]:41813 "EHLO gateway36.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729127AbeLNRhp (ORCPT ); Fri, 14 Dec 2018 12:37:45 -0500 X-Greylist: delayed 1500 seconds by postgrey-1.27 at vger.kernel.org; Fri, 14 Dec 2018 12:37:45 EST Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 6780D400D6516 for ; Fri, 14 Dec 2018 09:58:24 -0600 (CST) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id XqcygCkPW2PzOXqcygyOOE; Fri, 14 Dec 2018 10:47:52 -0600 X-Authority-Reason: nr=8 Received: from [189.250.131.212] (port=48852 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1gXqcd-002K7q-8o; Fri, 14 Dec 2018 10:47:51 -0600 Date: Fri, 14 Dec 2018 10:47:29 -0600 From: "Gustavo A. R. Silva" To: Sathya Prakash , Chaitra P B , Suganath Prabu Subramani Cc: MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] scsi: mptfusion: Fix potential Spectre v1 vulnerabilities Message-ID: <20181214164729.GA23188@embeddedor> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.131.212 X-Source-L: No X-Exim-ID: 1gXqcd-002K7q-8o X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.131.212]:48852 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 5 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP karg.hdr.id and port are indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. This issue was detected with the help of Smatch: drivers/message/fusion/mptctl.c:1360 mptctl_getiocinfo() warn: potential spectre issue 'ioc->pfacts' [r] drivers/message/fusion/mptctl.c:2788 mptctl_hp_targetinfo() warn: potential spectre issue 'hd->sel_timeout' [r] (local cap) Fix this by sanitizing both karg.hdr.id and port before using them to index ioc->pfacts and hd->sel_timeout. Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1]. [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva --- drivers/message/fusion/mptctl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 8d22d6134a89..f6c1311ae86f 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c @@ -66,6 +66,8 @@ #include #include +#include + #define COPYRIGHT "Copyright (c) 1999-2008 LSI Corporation" #define MODULEAUTHOR "LSI Corporation" #include "mptbase.h" @@ -1306,7 +1308,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size) kfree(karg); return -EINVAL; } - port = karg->hdr.port; + port = array_index_nospec(karg->hdr.port, 2); karg->port = port; pdev = (struct pci_dev *) ioc->pcidev; @@ -2689,6 +2691,7 @@ mptctl_hp_targetinfo(unsigned long arg) } if (karg.hdr.id >= MPT_MAX_FC_DEVICES) return -EINVAL; + karg.hdr.id = array_index_nospec(karg.hdr.id, MPT_MAX_FC_DEVICES); dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "mptctl_hp_targetinfo called.\n", ioc->name));