Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index e2ea691e42c6..377a2ee5d9ad 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -52,6 +52,8 @@
 #include <net/ip6_checksum.h>
 #include <linux/netconf.h>
 
+#include <linux/nospec.h>
+
 struct ip6mr_rule {
         struct fib_rule         common;
 };
@@ -1841,6 +1843,7 @@ int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)
                         return -EFAULT;
                 if (vr.mifi >= mrt->maxvif)
                         return -EINVAL;
+                vr.mifi = array_index_nospec(vr.mifi, mrt->maxvif);
                 read_lock(&mrt_lock);
                 vif = &mrt->vif_table[vr.mifi];
                 if (VIF_EXISTS(mrt, vr.mifi)) {
@@ -1915,6 +1918,7 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
                         return -EFAULT;
                 if (vr.mifi >= mrt->maxvif)
                         return -EINVAL;
+                vr.mifi = array_index_nospec(vr.mifi, mrt->maxvif);
                 read_lock(&mrt_lock);
                 vif = &mrt->vif_table[vr.mifi];
                 if (VIF_EXISTS(mrt, vr.mifi)) {