Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix device name validation in "modelstore" command #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alonre24 merged 2 commits into from
Dec 1, 2021
Merged

Fix device name validation in "modelstore" command #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea4d00
Fix device name validation in "modelstore" command
alonre24 Nov 30, 2021
045a7fe
Merge branch 'master' into fix_device_validation
alonre24 Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/backends/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
#include <stdlib.h>
#include <errno.h>
#include "backends/util.h"

int parseDeviceStr(const char *devicestr, RAI_Device *device, int64_t *deviceid) {
// if (strcasecmp(devicestr, "CPU") == 0) {
if (strncasecmp(devicestr, "CPU", 3) == 0) {
int parseDeviceStr(const char *device_str, RAI_Device *device, int64_t *device_id) {
if (strncasecmp(device_str, "CPU", 3) == 0) {
*device = RAI_DEVICE_CPU;
*deviceid = -1;
} else if (strcasecmp(devicestr, "GPU") == 0) {
*device_id = -1;
} else if (strcasecmp(device_str, "GPU") == 0) {
*device = RAI_DEVICE_GPU;
*deviceid = -1;
} else if (strncasecmp(devicestr, "GPU:", 4) == 0) {
*device_id = -1;
} else if (strncasecmp(device_str, "GPU:", 4) == 0) {
*device = RAI_DEVICE_GPU;
long long id;
sscanf(devicestr, "GPU:%lld", &id);
*deviceid = id;
// Convert the id string into a number, returns zero if no valid conversion could be
// preformed, and sets errno in case of overflow.
long long id = strtoll(device_str + 4, NULL, 0);
if (errno == ERANGE)
return 0;
*device_id = id;
} else {
return 0;
}

return 1;
}
2 changes: 1 addition & 1 deletion src/backends/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

#include "config/config.h"

int parseDeviceStr(const char *devicestr, RAI_Device *device, int64_t *deviceid);
int parseDeviceStr(const char *device_str, RAI_Device *device, int64_t *device_id);
8 changes: 5 additions & 3 deletions src/redisai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,14 @@ int RedisAI_ModelStore_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **arg
const char *devicestr;
AC_GetString(&ac, &devicestr, NULL, 0);
bool valid_device = false;
size_t device_prefix_len = strlen("GPU:"); // can also be "CPU:"
if (strcasecmp(devicestr, "CPU") == 0 || strcasecmp(devicestr, "GPU") == 0) {
valid_device = true;
} else if ((strncasecmp(devicestr, "GPU:", 4) == 0 || strncasecmp(devicestr, "CPU:", 4) == 0) &&
strlen(devicestr) <= 10) {
} else if ((strncasecmp(devicestr, "GPU:", device_prefix_len) == 0 ||
strncasecmp(devicestr, "CPU:", device_prefix_len) == 0) &&
strlen(devicestr) < 10) {

@DvirDukhan DvirDukhan Nov 30, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the change from <= to <?

@alonre24 alonre24 Dec 1, 2021

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No actual reason... I believe that 5 digits should be enough

bool digits_only = true;
for (size_t i = 5; i < strlen(devicestr); i++) {
for (size_t i = device_prefix_len; i < strlen(devicestr); i++) {
if (devicestr[i] < '0' || devicestr[i] > '9') {
digits_only = false;
break;
Expand Down
11 changes: 10 additions & 1 deletion tests/flow/tests_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,22 @@ def test_modelstore_errors(env):
con = get_connection(env, '{1}')
model_pb = load_file_content('pt-minimal.pt')

# Check that the basic arguments are valid (model's key, device, backend, blob)
# Check the validity of backend name and number of arguments
check_error_message(env, con, "wrong number of arguments for 'AI.MODELSTORE' command",
'AI.MODELSTORE', 'm{1}', 'TORCH', 'BLOB', model_pb)
check_error_message(env, con, "unsupported backend",
'AI.MODELSTORE', 'm{1}', 'PORCH', DEVICE, 'BLOB', model_pb)

# Check for valid device argument (should only be "CPU:<n>" or "GPU:<n>, where <n> is a number
# (contains digits only, up to 5).
check_error_message(env, con, "Invalid DEVICE",
'AI.MODELSTORE', 'm{1}', 'TORCH', 'bad_device', 'BLOB', model_pb)
check_error_message(env, con, "Invalid DEVICE",
'AI.MODELSTORE', 'm{1}', 'TORCH', 'CPU::', 'BLOB', model_pb)
check_error_message(env, con, "Invalid DEVICE",
'AI.MODELSTORE', 'm{1}', 'TORCH', 'CPU:1.8', 'BLOB', model_pb)
check_error_message(env, con, "Invalid DEVICE",

@DvirDukhan DvirDukhan Nov 30, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment explaining why this is invalid device

@alonre24 alonre24 Dec 1, 2021

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a comment in lines 28-29 explaining it...

'AI.MODELSTORE', 'm{1}', 'TORCH', 'CPU:123456', 'BLOB', model_pb)

# Check for validity of batching arguments.
check_error_message(env, con, "Invalid argument for BATCHSIZE",
Expand Down