drivers: speculative load before bound-check

[hercules2020/nv-tegra/linux-4.4.git] / drivers / media / i2c / ov9650.c

diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c
index 1ee6a5527c384676333587115a18565ba76f0519..7153edc4fcca504d66b7ef15f073af6492bfec5a 100644 (file)
--- a/drivers/media/i2c/ov9650.c
+++ b/drivers/media/i2c/ov9650.c
@@ -30,6 +30,7 @@
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-mediabus.h>
 #include <media/ov9650.h>
+#include <asm/barrier.h>
 
 static int debug;
 module_param(debug, int, 0644);
@@ -1086,6 +1087,8 @@ static int ov965x_enum_frame_sizes(struct v4l2_subdev *sd,
        if (fse->index >= ARRAY_SIZE(ov965x_framesizes))
                return -EINVAL;
 
+       speculation_barrier();
+
        while (--i)
                if (fse->code == ov965x_formats[i].code)
                        break;