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

Merge pull request #307 from mmichal10/add-len-check

Browse Source 
classifier: use secure versions of strcmp and strcpy
This commit is contained in:
Daniel Madej 2020-01-25 14:25:14 +01:00 committed by GitHub
commit cc77929a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/cas_cache/classifier.c
View File

@ -208,7 +208,7 @@ static int _cas_cls_string_ctr(struct cas_classifier *cls,
if (!ctx)
return -ENOMEM;
strcpy(ctx->string, data);
strncpy(ctx->string, data, MAX_STRING_SPECIFIER_LEN);
ctx->len = len;
c->context = ctx;
@ -457,6 +457,7 @@ static cas_cls_eval_t _cas_cls_extension_test(
struct inode *inode;
struct dentry *dentry;
char *extension;
uint32_t len;
ctx = c->context;
inode = io->inode;
@ -474,7 +475,9 @@ static cas_cls_eval_t _cas_cls_extension_test(
return cas_cls_eval_no;
/* First character of @extension is '.', which we don't want to compare */
if (strcmp(ctx->string, extension + 1) == 0)
len = strnlen(extension + 1, dentry->d_name.len);
len = min(ctx->len, len);
if (strncmp(ctx->string, extension + 1, len) == 0)
return cas_cls_eval_yes;
return cas_cls_eval_no;
@ -547,12 +550,15 @@ static cas_cls_eval_t _cas_cls_process_name_test(
currently executing task */
struct task_struct *ti = current;
char comm[TASK_COMM_LEN];
uint32_t len;
ctx = c->context;
get_task_comm(comm, ti);
if (strcmp(ctx->string, comm) == 0)
len = strnlen(comm, TASK_COMM_LEN);
len = min(ctx->len, len);
if (strncmp(ctx->string, comm, len) == 0)
return cas_cls_eval_yes;
return cas_cls_eval_no;