Added error check in Getfilecon #584
Conversation
|
|
||
| if err != nil { | ||
| return "", err | ||
| } |
There was a problem hiding this comment.
Then probably change the final return to return string(con), nil in this function?
There was a problem hiding this comment.
@hqhq
Updated as per the comments
There was a problem hiding this comment.
I found this function if not used, even when it's first added, ping @rhatdan .
There was a problem hiding this comment.
@hqhq
There is no caller at this moment for this function
There was a problem hiding this comment.
We use this function when debugging code, in the past. Do we really need to remove it just because no one is using it currently?
There was a problem hiding this comment.
Not really, just make sure we know it's there :)
rajasec
force-pushed
the
selinux-errcheck
branch
from
0d780a3 to
0379459
Compare
|
|
||
| if err != nil { | ||
| return "", err | ||
| } | ||
| // Trim the NUL byte at the end of the byte buffer, if present. | ||
| if con[len(con)-1] == '\x00' { |
There was a problem hiding this comment.
What are the odds of no error and len(con)==0? If possible should probably add a if len(con) check before causing a "panic: runtime error: index out of range"
There was a problem hiding this comment.
Yes I agree with this check
Signed-off-by: rajasec <[email protected]> Fixed review comments Signed-off-by: rajasec <[email protected]> Fixed review comments for adding length check Signed-off-by: rajasec <[email protected]> Fixed review comment Signed-off-by: rajasec <[email protected]>
rajasec
force-pushed
the
selinux-errcheck
branch
from
0379459 to
fdbfca6
Compare
| if con[len(con)-1] == '\x00' { | ||
| con = con[:len(con)-1] | ||
| if len(con) > 0 { | ||
| if con[len(con)-1] == '\x00' { |
There was a problem hiding this comment.
It's minor, but I think we should change it to if len(con) > 0 && con[len(con)-1] == '\x00'.
rajasec
force-pushed
the
selinux-errcheck
branch
from
fdbfca6 to
039d25c
Compare
|
LGTM |
|
Looks good. |
|
👍 |
|
LGTM |
Added error check in Getfilecon
…-or-duplicates glossary: Make objects explicitly unordered and forbid duplicate names
This condition landed in 27a05de (Add text about extensions, 2016-06-26, opencontainers#510) with subsequent wording tweaks in 3f0440b (config.md: add empty limit for key of annotations, Dec 28 10:35:19 2016, opencontainers#645) and 2c8feeb (config: Bring "unique... within this map" back together, 2017-01-12, opencontainers#654). However, since eeaccfa (glossary: Make objects explicitly unordered and forbid duplicate names, 2016-09-27, opencontainers#584) we forbid duplicate keys on *all* objects (not just annotations), so this PR removes the redundant annotation-specific condition. Signed-off-by: W. Trevor King <[email protected]>
Added the error check for Getfilecon if it returns an error.
Signed-off-by: rajasec [email protected]