This is a note to let you know that I've just added the patch titled IB/ucm: Fix Spectre v1 vulnerability to the 4.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ib-ucm-fix-spectre-v1-vulnerability.patch and it can be found in the queue-4.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 0295e39595e1146522f2722715dba7f7fba42217 Mon Sep 17 00:00:00 2001 From: "Gustavo A. R. Silva" <gustavo@xxxxxxxxxxxxxx> Date: Tue, 16 Oct 2018 16:32:40 +0200 Subject: IB/ucm: Fix Spectre v1 vulnerability From: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx> commit 0295e39595e1146522f2722715dba7f7fba42217 upstream. hdr.cmd can be 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/infiniband/core/ucm.c:1127 ib_ucm_write() warn: potential spectre issue 'ucm_cmd_table' [r] (local cap) Fix this by sanitizing hdr.cmd before using it to index ucm_cmd_table. 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@xxxxxxxxxxxxxxx Signed-off-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx> Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/infiniband/core/ucm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -46,6 +46,8 @@ #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/nospec.h> + #include <linux/uaccess.h> #include <rdma/ib.h> @@ -1123,6 +1125,7 @@ static ssize_t ib_ucm_write(struct file if (hdr.cmd >= ARRAY_SIZE(ucm_cmd_table)) return -EINVAL; + hdr.cmd = array_index_nospec(hdr.cmd, ARRAY_SIZE(ucm_cmd_table)); if (hdr.in + sizeof(hdr) > len) return -EINVAL; Patches currently in stable-queue which might be from gustavo@xxxxxxxxxxxxxx are queue-4.18/ptp-fix-spectre-v1-vulnerability.patch queue-4.18/rdma-ucma-fix-spectre-v1-vulnerability.patch queue-4.18/usb-gadget-storage-fix-spectre-v1-vulnerability.patch queue-4.18/ib-ucm-fix-spectre-v1-vulnerability.patch