1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
From 34195a57528a3f2c807bc3eeb8c934b8ea8289bd Mon Sep 17 00:00:00 2001
From: Thang Tran <TranKimThang279@gmail.com>
Date: Mon, 27 May 2019 08:18:26 +0200
Subject: [PATCH] video:fixed DISOpticalFlow segfault from small img
CVE: CVE-2019-19624
Upstream-Status: Backport [https://github.com/opencv/opencv/commit/d1615ba11a93062b1429fce9f0f638d1572d3418.patch]
Comment: No changes in any hunk
Signed-off-by: Neetika Singh <Neetika.Singh@kpit.com>
---
modules/video/src/dis_flow.cpp | 67 ++++++++++++++++++++++++-
modules/video/test/test_OF_accuracy.cpp | 28 +++++++++++
2 files changed, 93 insertions(+), 2 deletions(-)
diff --git a/modules/video/src/dis_flow.cpp b/modules/video/src/dis_flow.cpp
index b86df1564b..adafcc92d8 100644
--- a/modules/video/src/dis_flow.cpp
+++ b/modules/video/src/dis_flow.cpp
@@ -140,6 +140,8 @@ class DISOpticalFlowImpl CV_FINAL : public DISOpticalFlow
void prepareBuffers(Mat &I0, Mat &I1, Mat &flow, bool use_flow);
void precomputeStructureTensor(Mat &dst_I0xx, Mat &dst_I0yy, Mat &dst_I0xy, Mat &dst_I0x, Mat &dst_I0y, Mat &I0x,
Mat &I0y);
+ int autoSelectCoarsestScale(int img_width);
+ void autoSelectPatchSizeAndScales(int img_width);
struct PatchInverseSearch_ParBody : public ParallelLoopBody
{
@@ -435,6 +437,44 @@ void DISOpticalFlowImpl::precomputeStructureTensor(Mat &dst_I0xx, Mat &dst_I0yy,
}
}
+int DISOpticalFlowImpl::autoSelectCoarsestScale(int img_width)
+{
+ const int fratio = 5;
+ return std::max(0, (int)std::floor(log2((2.0f*(float)img_width) / ((float)fratio * (float)patch_size))));
+}
+
+void DISOpticalFlowImpl::autoSelectPatchSizeAndScales(int img_width)
+{
+ switch (finest_scale)
+ {
+ case 1:
+ patch_size = 8;
+ coarsest_scale = autoSelectCoarsestScale(img_width);
+ finest_scale = std::max(coarsest_scale-2, 0);
+ break;
+
+ case 3:
+ patch_size = 12;
+ coarsest_scale = autoSelectCoarsestScale(img_width);
+ finest_scale = std::max(coarsest_scale-4, 0);
+ break;
+
+ case 4:
+ patch_size = 12;
+ coarsest_scale = autoSelectCoarsestScale(img_width);
+ finest_scale = std::max(coarsest_scale-5, 0);
+ break;
+
+ // default case, fall-through.
+ case 2:
+ default:
+ patch_size = 8;
+ coarsest_scale = autoSelectCoarsestScale(img_width);
+ finest_scale = std::max(coarsest_scale-2, 0);
+ break;
+ }
+}
+
DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOpticalFlowImpl &_dis, int _nstripes,
int _hs, Mat &dst_Sx, Mat &dst_Sy,
Mat &src_Ux, Mat &src_Uy, Mat &_I0, Mat &_I1,
@@ -1313,9 +1353,20 @@ bool DISOpticalFlowImpl::ocl_calc(InputArray I0, InputArray I1, InputOutputArray
else
flow.create(I1Mat.size(), CV_32FC2);
UMat &u_flowMat = flow.getUMatRef();
- coarsest_scale = min((int)(log(max(I0Mat.cols, I0Mat.rows) / (4.0 * patch_size)) / log(2.0) + 0.5), /* Original code serach for maximal movement of width/4 */
+ coarsest_scale = min((int)(log(max(I0Mat.cols, I0Mat.rows) / (4.0 * patch_size)) / log(2.0) + 0.5), /* Original code search for maximal movement of width/4 */
(int)(log(min(I0Mat.cols, I0Mat.rows) / patch_size) / log(2.0))); /* Deepest pyramid level greater or equal than patch*/
+ if (coarsest_scale<0)
+ CV_Error(cv::Error::StsBadSize, "The input image must have either width or height >= 12");
+
+ if (coarsest_scale<finest_scale)
+ {
+ // choose the finest level based on coarsest level.
+ // Refs: https://github.com/tikroeger/OF_DIS/blob/2c9f2a674f3128d3a41c10e41cc9f3a35bb1b523/run_dense.cpp#L239
+ int original_img_width = I0.size().width;
+ autoSelectPatchSizeAndScales(original_img_width);
+ }
+
ocl_prepareBuffers(I0Mat, I1Mat, u_flowMat, use_input_flow);
u_Ux[coarsest_scale].setTo(0.0f);
u_Uy[coarsest_scale].setTo(0.0f);
@@ -1380,8 +1431,20 @@ void DISOpticalFlowImpl::calc(InputArray I0, InputArray I1, InputOutputArray flo
else
flow.create(I1Mat.size(), CV_32FC2);
Mat flowMat = flow.getMat();
- coarsest_scale = min((int)(log(max(I0Mat.cols, I0Mat.rows) / (4.0 * patch_size)) / log(2.0) + 0.5), /* Original code serach for maximal movement of width/4 */
+ coarsest_scale = min((int)(log(max(I0Mat.cols, I0Mat.rows) / (4.0 * patch_size)) / log(2.0) + 0.5), /* Original code search for maximal movement of width/4 */
(int)(log(min(I0Mat.cols, I0Mat.rows) / patch_size) / log(2.0))); /* Deepest pyramid level greater or equal than patch*/
+
+ if (coarsest_scale<0)
+ CV_Error(cv::Error::StsBadSize, "The input image must have either width or height >= 12");
+
+ if (coarsest_scale<finest_scale)
+ {
+ // choose the finest level based on coarsest level.
+ // Refs: https://github.com/tikroeger/OF_DIS/blob/2c9f2a674f3128d3a41c10e41cc9f3a35bb1b523/run_dense.cpp#L239
+ int original_img_width = I0.size().width;
+ autoSelectPatchSizeAndScales(original_img_width);
+ }
+
int num_stripes = getNumThreads();
prepareBuffers(I0Mat, I1Mat, flowMat, use_input_flow);
diff --git a/modules/video/test/test_OF_accuracy.cpp b/modules/video/test/test_OF_accuracy.cpp
index affbab6586..b99ffce2a8 100644
--- a/modules/video/test/test_OF_accuracy.cpp
+++ b/modules/video/test/test_OF_accuracy.cpp
@@ -121,6 +121,34 @@ TEST(DenseOpticalFlow_DIS, ReferenceAccuracy)
}
}
+TEST(DenseOpticalFlow_DIS, InvalidImgSize_CoarsestLevelLessThanZero)
+{
+ cv::Ptr<cv::DISOpticalFlow> of = cv::DISOpticalFlow::create();
+ const int mat_size = 10;
+
+ cv::Mat x(mat_size, mat_size, CV_8UC1, 42);
+ cv::Mat y(mat_size, mat_size, CV_8UC1, 42);
+ cv::Mat flow;
+
+ ASSERT_THROW(of->calc(x, y, flow), cv::Exception);
+}
+
+// make sure that autoSelectPatchSizeAndScales() works properly.
+TEST(DenseOpticalFlow_DIS, InvalidImgSize_CoarsestLevelLessThanFinestLevel)
+{
+ cv::Ptr<cv::DISOpticalFlow> of = cv::DISOpticalFlow::create();
+ const int mat_size = 80;
+
+ cv::Mat x(mat_size, mat_size, CV_8UC1, 42);
+ cv::Mat y(mat_size, mat_size, CV_8UC1, 42);
+ cv::Mat flow;
+
+ of->calc(x, y, flow);
+
+ ASSERT_EQ(flow.rows, mat_size);
+ ASSERT_EQ(flow.cols, mat_size);
+}
+
TEST(DenseOpticalFlow_VariationalRefinement, ReferenceAccuracy)
{
Mat frame1, frame2, GT;
|
