github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

casadm: prevent acccess to uninitialized variables

Browse Source 
Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2021-01-05 09:54:17 -05:00
parent 42c3f3ed8c
commit 92ab19999e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
casadm/cas_lib.c
View File

@ -2842,7 +2842,7 @@ int _check_cache_device(const char *device_path,
int check_cache_device(const char *device_path) int check_cache_device(const char *device_path)
{ {
struct kcas_cache_check_device cmd_info; struct kcas_cache_check_device cmd_info = {};
FILE *intermediate_file[2]; FILE *intermediate_file[2];
int result; int result;
@ -2878,9 +2878,10 @@ int check_cache_device(const char *device_path)
} }
int zero_md(const char *cache_device){ int zero_md(const char *cache_device){
struct kcas_cache_check_device cmd_info; struct kcas_cache_check_device cmd_info = {};
char zero_page[4096] = {0}; char zero_page[4096] = {0};
int fd = 0; int fd = 0;
int result;
/* check if given cache device exists */ /* check if given cache device exists */
fd = open(cache_device, O_RDONLY); fd = open(cache_device, O_RDONLY);
@ -2897,8 +2898,13 @@ int zero_md(const char *cache_device){
return FAILURE; return FAILURE;
} }
result = _check_cache_device(cache_device, &cmd_info);
if (result == FAILURE) {
cas_printf(LOG_ERR, "Failed to retrieve device's information.\n");
return FAILURE;
}
/* don't delete metadata if device hasn't got CAS's metadata */ /* don't delete metadata if device hasn't got CAS's metadata */
_check_cache_device(cache_device, &cmd_info);
if (!cmd_info.is_cache_device) { if (!cmd_info.is_cache_device) {
cas_printf(LOG_ERR, "Device '%s' does not contain OpenCAS's metadata.\n", cache_device); cas_printf(LOG_ERR, "Device '%s' does not contain OpenCAS's metadata.\n", cache_device);
return FAILURE; return FAILURE;