p85971406
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!42044 [MSLITE][CPU] fuzz problem fix 

Merge pull request !42044 from Greatpan/deconv_fuzz3
This commit is contained in:
i-robot 2022-09-15 13:09:19 +00:00 committed by Gitee
parent f648d842a1 08aefbf69a
commit 051f8c5541
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mindspore/lite/src/common/log_util.h
View File

@ -77,11 +77,21 @@
} \
} while (0)
#define CHECK_LESS_RETURN_RET(size1, size2, ret, free_parm) \
do { \
if ((size1) < (size2)) { \
MS_LOG(ERROR) << #size1 << " must not be less than " << #size2; \
free(free_parm); \
return ret; \
} \
} while (0)
#else
#define CHECK_NULL_RETURN(ptr)
#define CHECK_NULL_RETURN_VOID(ptr)
#define CHECK_LESS_RETURN(size1, size2)
#define CHECK_NOT_EQUAL_RETURN(size1, size2)
#define CHECK_EQUAL_RETURN(size1, size2)
#define CHECK_LESS_RETURN_RET(size1, size2, ret, do_exec)
#endif
#endif // MINDSPORE_LITE_SRC_COMMON_LOG_UTIL_H_

18
mindspore/lite/src/common/ops/populate/deconv2d_populate.cc
View File

@ -85,7 +85,9 @@ OpParameter *PopulateDeconvParameter(const void *prim) {
free(param);
return nullptr;
}
CHECK_LESS_RETURN_RET(INT32_MAX, *(kernel_size->begin()), nullptr, param);
param->kernel_h_ = static_cast<int>(*(kernel_size->begin()));
CHECK_LESS_RETURN_RET(INT32_MAX, *(kernel_size->begin() + 1), nullptr, param);
param->kernel_w_ = static_cast<int>(*(kernel_size->begin() + 1));
}
param->output_padding_h_ = 0;
@ -96,7 +98,9 @@ OpParameter *PopulateDeconvParameter(const void *prim) {
free(param);
return nullptr;
}
CHECK_LESS_RETURN_RET(INT32_MAX, *(output_paddings->begin()), nullptr, param);
param->output_padding_h_ = static_cast<int>(*(output_paddings->begin()));
CHECK_LESS_RETURN_RET(INT32_MAX, *(output_paddings->begin() + 1), nullptr, param);
param->output_padding_w_ = static_cast<int>(*(output_paddings->begin() + 1));
}
if (param->output_padding_h_ < 0 || param->output_padding_w_ < 0) {
@ -116,8 +120,11 @@ OpParameter *PopulateDeconvParameter(const void *prim) {
return nullptr;
}
CHECK_LESS_RETURN_RET(INT32_MAX, value->group(), nullptr, param);
param->group_ = static_cast<int>(value->group());
CHECK_LESS_RETURN_RET(INT32_MAX, *(stride->begin()), nullptr, param);
param->stride_h_ = static_cast<int>(*(stride->begin()));
CHECK_LESS_RETURN_RET(INT32_MAX, *(stride->begin() + 1), nullptr, param);
param->stride_w_ = static_cast<int>(*(stride->begin() + 1));
if (pad_list == nullptr || pad_list->size() < kMinShapeSizeFour) {
@ -126,14 +133,25 @@ OpParameter *PopulateDeconvParameter(const void *prim) {
param->pad_l_ = 0;
param->pad_r_ = 0;
} else {
CHECK_LESS_RETURN_RET(INT32_MAX, *(pad_list->begin()), nullptr, param);
param->pad_u_ = static_cast<int>(*(pad_list->begin()));
CHECK_LESS_RETURN_RET(INT32_MAX, *(pad_list->begin() + 1), nullptr, param);
param->pad_d_ = static_cast<int>(*(pad_list->begin() + 1));
CHECK_LESS_RETURN_RET(INT32_MAX, *(pad_list->begin() + kOffsetTwo), nullptr, param);
param->pad_l_ = static_cast<int>(*(pad_list->begin() + kOffsetTwo));
CHECK_LESS_RETURN_RET(INT32_MAX, *(pad_list->begin() + kOffsetThree), nullptr, param);
param->pad_r_ = static_cast<int>(*(pad_list->begin() + kOffsetThree));
}
CHECK_LESS_RETURN_RET(INT32_MAX, *(dilation->begin()), nullptr, param);
param->dilation_h_ = static_cast<int>(*(dilation->begin()));
CHECK_LESS_RETURN_RET(INT32_MAX, *(dilation->begin() + 1), nullptr, param);
param->dilation_w_ = static_cast<int>(*(dilation->begin() + 1));
CHECK_LESS_RETURN_RET(INT32_MAX, value->in_channel(), nullptr, param);
param->input_channel_ = static_cast<int>(value->in_channel());
CHECK_LESS_RETURN_RET(INT32_MAX, value->out_channel(), nullptr, param);
param->output_channel_ = static_cast<int>(value->out_channel());
auto act_type = value->activation_type();