Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-gkh' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Doug writes:
"Really final for-rc pull request for 4.19
Ok, so last week I thought we had sent our final pull request for
4.19. Well, wouldn't ya know someone went and found a couple Spectre
v1 fixes were needed :-/. So, a couple *very* small specter patches
for this (hopefully) final -rc week."
* tag 'for-gkh' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/ucma: Fix Spectre v1 vulnerability
IB/ucm: Fix Spectre v1 vulnerability
+6
+3
drivers/infiniband/core/ucm.c
+3
drivers/infiniband/core/ucm.c
···
46
46
#include <linux/mutex.h>
47
47
#include <linux/slab.h>
48
48
49
+
#include <linux/nospec.h>
50
+
49
51
#include <linux/uaccess.h>
50
52
51
53
#include <rdma/ib.h>
···
1122
1120
1123
1121
if (hdr.cmd >= ARRAY_SIZE(ucm_cmd_table))
1124
1122
return -EINVAL;
1123
+
hdr.cmd = array_index_nospec(hdr.cmd, ARRAY_SIZE(ucm_cmd_table));
1125
1124
1126
1125
if (hdr.in + sizeof(hdr) > len)
1127
1126
return -EINVAL;
+3
drivers/infiniband/core/ucma.c
+3
drivers/infiniband/core/ucma.c
···
44
44
#include <linux/module.h>
45
45
#include <linux/nsproxy.h>
46
46
47
+
#include <linux/nospec.h>
48
+
47
49
#include <rdma/rdma_user_cm.h>
48
50
#include <rdma/ib_marshall.h>
49
51
#include <rdma/rdma_cm.h>
···
1678
1676
1679
1677
if (hdr.cmd >= ARRAY_SIZE(ucma_cmd_table))
1680
1678
return -EINVAL;
1679
+
hdr.cmd = array_index_nospec(hdr.cmd, ARRAY_SIZE(ucma_cmd_table));
1681
1680
1682
1681
if (hdr.in + sizeof(hdr) > len)
1683
1682
return -EINVAL;