From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] usbip: vhci_sysfs: fix potential Spectre v1 From: "Gustavo A. R. Silva" Message-Id: <20180517201628.GA6090@embeddedor.com> Date: Thu, 17 May 2018 15:16:28 -0500 To: Valentina Manea , Shuah Khan , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-ID: cGRldl9uciBhbmQgcmhwb3J0IGNhbiBiZSBjb250cm9sbGVkIGJ5IHVzZXItc3BhY2UsIGhlbmNl IGxlYWRpbmcgdG8KYSBwb3RlbnRpYWwgZXhwbG9pdGF0aW9uIG9mIHRoZSBTcGVjdHJlIHZhcmlh bnQgMSB2dWxuZXJhYmlsaXR5LgoKVGhpcyBpc3N1ZSB3YXMgZGV0ZWN0ZWQgd2l0aCB0aGUgaGVs cCBvZiBTbWF0Y2g6CmRyaXZlcnMvdXNiL3VzYmlwL3ZoY2lfc3lzZnMuYzoyMzggZGV0YWNoX3N0 b3JlKCkgd2FybjogcG90ZW50aWFsIHNwZWN0cmUgaXNzdWUgJ3ZoY2lzJwpkcml2ZXJzL3VzYi91 c2JpcC92aGNpX3N5c2ZzLmM6MzI4IGF0dGFjaF9zdG9yZSgpIHdhcm46IHBvdGVudGlhbCBzcGVj dHJlIGlzc3VlICd2aGNpcycKZHJpdmVycy91c2IvdXNiaXAvdmhjaV9zeXNmcy5jOjMzOCBhdHRh Y2hfc3RvcmUoKSB3YXJuOiBwb3RlbnRpYWwgc3BlY3RyZSBpc3N1ZSAndmhjaS0+dmhjaV9oY2Rf c3MtPnZkZXYnCmRyaXZlcnMvdXNiL3VzYmlwL3ZoY2lfc3lzZnMuYzozNDAgYXR0YWNoX3N0b3Jl KCkgd2FybjogcG90ZW50aWFsIHNwZWN0cmUgaXNzdWUgJ3ZoY2ktPnZoY2lfaGNkX2hzLT52ZGV2 JwoKRml4IHRoaXMgYnkgc2FuaXRpemluZyBwZGV2X25yIGFuZCByaHBvcnQgYmVmb3JlIHVzaW5n IHRoZW0gdG8gaW5kZXgKdmhjaXMgYW5kIHZoY2ktPnZoY2lfaGNkX3NzLT52ZGV2IHJlc3BlY3Rp dmVseS4KCk5vdGljZSB0aGF0IGdpdmVuIHRoYXQgc3BlY3VsYXRpb24gd2luZG93cyBhcmUgbGFy Z2UsIHRoZSBwb2xpY3kgaXMKdG8ga2lsbCB0aGUgc3BlY3VsYXRpb24gb24gdGhlIGZpcnN0IGxv YWQgYW5kIG5vdCB3b3JyeSBpZiBpdCBjYW4gYmUKY29tcGxldGVkIHdpdGggYSBkZXBlbmRlbnQg bG9hZC9zdG9yZSBbMV0uCgpbMV0gaHR0cHM6Ly9tYXJjLmluZm8vP2w9bGludXgta2VybmVsJm09 MTUyNDQ5MTMxMTE0Nzc4Jnc9MgoKQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9m Zi1ieTogR3VzdGF2byBBLiBSLiBTaWx2YSA8Z3VzdGF2b0BlbWJlZGRlZG9yLmNvbT4KLS0tCkNo YW5nZXMgaW4gdjI6CiAtIFBsYWNlIHRoZSBiYXJyaWVycyBpbnRvIHZhbGlkX3BvcnQuCgogZHJp dmVycy91c2IvdXNiaXAvdmhjaV9zeXNmcy5jIHwgNiArKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA2 IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi91c2JpcC92aGNpX3N5c2Zz LmMgYi9kcml2ZXJzL3VzYi91c2JpcC92aGNpX3N5c2ZzLmMKaW5kZXggNDg4MDgzOC4uNjlkYjBj OSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvdXNiaXAvdmhjaV9zeXNmcy5jCisrKyBiL2RyaXZl cnMvdXNiL3VzYmlwL3ZoY2lfc3lzZnMuYwpAQCAtMTAsNiArMTAsOCBAQAogI2luY2x1ZGUgPGxp bnV4L3BsYXRmb3JtX2RldmljZS5oPgogI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4KIAorI2luY2x1 ZGUgPGxpbnV4L25vc3BlYy5oPgorCiAjaW5jbHVkZSAidXNiaXBfY29tbW9uLmgiCiAjaW5jbHVk ZSAidmhjaS5oIgogCkBAIC0yMTEsMTAgKzIxMywxNCBAQCBzdGF0aWMgaW50IHZhbGlkX3BvcnQo X191MzIgcGRldl9uciwgX191MzIgcmhwb3J0KQogCQlwcl9lcnIoInBkZXYgJXVcbiIsIHBkZXZf bnIpOwogCQlyZXR1cm4gMDsKIAl9CisJcGRldl9uciA9IGFycmF5X2luZGV4X25vc3BlYyhwZGV2 X25yLCB2aGNpX251bV9jb250cm9sbGVycyk7CisKIAlpZiAocmhwb3J0ID49IFZIQ0lfSENfUE9S VFMpIHsKIAkJcHJfZXJyKCJyaHBvcnQgJXVcbiIsIHJocG9ydCk7CiAJCXJldHVybiAwOwogCX0K KwlyaHBvcnQgPSBhcnJheV9pbmRleF9ub3NwZWMocmhwb3J0LCBWSENJX0hDX1BPUlRTKTsKKwog CXJldHVybiAxOwogfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqQUT5IyRoSkIZ0yMTFMfIJBdzhTv+uKqiYu+O2toAwiituSMeu+1GMlcYfjrtKZq/vZkld ARC-Seal: i=1; a=rsa-sha256; t=1526588190; cv=none; d=google.com; s=arc-20160816; b=yDvzewUASEVz2KI3yAHK1UiFel3XLdjLNLqN6cZ5ppk2QvmrA6ncpmKQPsPq94zbQ6 4agH/7v7g6xvA60+mtdtGgV5icPhlzfe3SztMrE0j/tVmfHRxzlqSh/r3/MAWmQ+hMmB BOzmpbgvcIegaPX9NbHFimCbgIG4u3JKqoIptEgJ5HE48RgHD2dXqWpVTK5pIu4fp5VC RLkzr9j2YhIGVYRjmc7ektYFWZRED6nyCgdiDQaDl7n/s2Evmxv82a3nZObVqup/xz9o v+RfaYUUOThN6zSk5jbZEAFHFZkujo+JCdBTdrbr+mKqew+aFY17klaA6dLMZBN8E545 e3sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:arc-authentication-results; bh=iGxrz26UH2sknN+MHX+8+T+TEKegGmdFzWACNE2TbJQ=; b=ny+WQLYd6Oq+VnbehbclBuEUT1U76u1uZ9eW2s3GaCwnYGuCrxuhQsVufuNfY8o4sg CEYRIfItoVmsHmqcXQ18osWS1HdbsqKvs6EQBHTYm9gC0Of4HgX9lPenZ/ZOqsGdnm3/ DCN47cOHXHQK7HgCTSO77kBuh87rvNq+J/S5yDYU6jnX7SaJbEL9dOSrciJ66lRr/O6B f4mxmxLAj0VYeACtPqQe3LToWcRlWbyLrjMSBh2aLYsJk0CuwgFmByHTpvaaojS6BjVn CXcFA64nIOBF9wWd5JPHBclFSLuWZBCCEBWYNgc03eTCoGdIrvn/JsBy4JAvM7retAQL /cYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gustavo@embeddedor.com designates 192.185.58.11 as permitted sender) smtp.mailfrom=gustavo@embeddedor.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of gustavo@embeddedor.com designates 192.185.58.11 as permitted sender) smtp.mailfrom=gustavo@embeddedor.com X-Authority-Reason: nr=8 Date: Thu, 17 May 2018 15:16:28 -0500 From: "Gustavo A. R. Silva" To: Valentina Manea , Shuah Khan , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH v2] usbip: vhci_sysfs: fix potential Spectre v1 Message-ID: <20180517201628.GA6090@embeddedor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) 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 - linuxfoundation.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 201.172.20.167 X-Source-L: No X-Exim-ID: 1fJPK9-0011mL-8i X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: cablelink20-167.telefonia.intercable.net (embeddedor) [201.172.20.167]:57166 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 3 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1600661041859915107?= X-GMAIL-MSGID: =?utf-8?q?1600743737752816906?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: pdev_nr and rhport can be 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/usb/usbip/vhci_sysfs.c:238 detach_store() warn: potential spectre issue 'vhcis' drivers/usb/usbip/vhci_sysfs.c:328 attach_store() warn: potential spectre issue 'vhcis' drivers/usb/usbip/vhci_sysfs.c:338 attach_store() warn: potential spectre issue 'vhci->vhci_hcd_ss->vdev' drivers/usb/usbip/vhci_sysfs.c:340 attach_store() warn: potential spectre issue 'vhci->vhci_hcd_hs->vdev' Fix this by sanitizing pdev_nr and rhport before using them to index vhcis and vhci->vhci_hcd_ss->vdev respectively. 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 --- Changes in v2: - Place the barriers into valid_port. drivers/usb/usbip/vhci_sysfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c index 4880838..69db0c9 100644 --- a/drivers/usb/usbip/vhci_sysfs.c +++ b/drivers/usb/usbip/vhci_sysfs.c @@ -10,6 +10,8 @@ #include #include +#include + #include "usbip_common.h" #include "vhci.h" @@ -211,10 +213,14 @@ static int valid_port(__u32 pdev_nr, __u32 rhport) pr_err("pdev %u\n", pdev_nr); return 0; } + pdev_nr = array_index_nospec(pdev_nr, vhci_num_controllers); + if (rhport >= VHCI_HC_PORTS) { pr_err("rhport %u\n", rhport); return 0; } + rhport = array_index_nospec(rhport, VHCI_HC_PORTS); + return 1; } -- 2.7.4