Fix device name validation in "modelstore" command#884
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #884 +/- ##
==========================================
+ Coverage 81.21% 81.24% +0.02%
==========================================
Files 54 54
Lines 8145 8152 +7
==========================================
+ Hits 6615 6623 +8
+ Misses 1530 1529 -1
Continue to review full report at Codecov.
|
DvirDukhan
reviewed
Nov 30, 2021
DvirDukhan
left a comment
There was a problem hiding this comment.
where was the 5th character did not validated?
anyway, looks good
| strlen(devicestr) <= 10) { | ||
| } else if ((strncasecmp(devicestr, "GPU:", device_prefix_len) == 0 || | ||
| strncasecmp(devicestr, "CPU:", device_prefix_len) == 0) && | ||
| strlen(devicestr) < 10) { |
Collaborator
Author
There was a problem hiding this comment.
No actual reason... I believe that 5 digits should be enough
| '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", |
There was a problem hiding this comment.
add a comment explaining why this is invalid device
Collaborator
Author
There was a problem hiding this comment.
There is a comment in lines 28-29 explaining it...
DvirDukhan
approved these changes
Dec 1, 2021
DvirDukhan
pushed a commit
that referenced
this pull request
Jan 2, 2022
DvirDukhan
pushed a commit
that referenced
this pull request
Jan 5, 2022
* Merge pull request #892 from RedisAI/tflite_avoid_magic_numbers avoid magic numbers in tflite * Merge pull request #891 from RedisAI/validate_runqueue_upon_restart create runqueue upon model and script loading * Merge pull request #888 from RedisAI/pytorch_1_10 updated pytorch and cuda version * Removed Xenial (#893) * Merge pull request #894 from RedisAI/set_cluster_timeout_on_env_reset added 120 seconds timeout for env restart and reload * Fix device name validation in "modelstore" command (#884) * 1.2.6 version bump Co-authored-by: Chayim <[email protected]> Co-authored-by: alonre24 <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The fifth character was not validated.
Also, for scriptstore and the deprecated modelset and scriptset, the only validation occurs in
parseDeviceStr(which is from within the backends, after parsing stage). This PR replacessscanfwithstrtollinparseDeviceStr, to have safe exit in case of invalid device id string in these commands.