General snprintf() hardenings #163
Merged
Conversation
This file contains 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
klali
requested changes
May 18, 2018
pam_yubico.c
Outdated
| @@ -308,7 +308,11 @@ authorize_user_token_ldap (struct cfg *cfg, | |||
| DBG ("Failed allocating %zu bytes", i); | |||
| goto done; | |||
| } | |||
| sprintf (find, "%s=%s,%s", cfg->user_attr, user, cfg->ldapdn); | |||
| int j = snprintf (find, i, "%s=%s,%s", cfg->user_attr, user, cfg->ldapdn); | |||
There was a problem hiding this comment.
Please move the variable declaration up to start of the block.
util.c
Outdated
| @@ -68,7 +68,10 @@ get_user_cfgfile_path(const char *common_path, const char *filename, const struc | |||
| if ((userfile = malloc(len)) == NULL) { | |||
| return 0; | |||
| } | |||
| snprintf(userfile, len, "%s/%s", common_path, filename); | |||
| int i = snprintf(userfile, len, "%s/%s", common_path, filename); | |||
There was a problem hiding this comment.
Same thing here, int i needs to move up.
util.c
Outdated
| @@ -79,7 +82,10 @@ get_user_cfgfile_path(const char *common_path, const char *filename, const struc | |||
| if ((userfile = malloc(len)) == NULL) { | |||
| return 0; | |||
| } | |||
| snprintf(userfile, len, "%s/.yubico/%s", user->pw_dir, filename); | |||
| int i = snprintf(userfile, len, "%s/.yubico/%s", user->pw_dir, filename); | |||
There was a problem hiding this comment.
Here as well, please move the declaration up.
util.c
Outdated
| @@ -332,7 +338,14 @@ check_user_challenge_file(const char *chalresp_path, const struct passwd *user, | |||
| ret = AUTH_ERROR; | |||
| goto out; | |||
| } | |||
| snprintf(userfile_pattern, len, "%s-*", userfile); | |||
|
|
|||
| int i = snprintf(userfile_pattern, len, "%s-*", userfile); | |||
|
Here you go. Shouldn't this be something that would be detected by Travis? |
This moves variable declrations to the beginning of a block to be C90-compliant.
|
Yes, this should ideally be detected. I compile it with --enable-gcc-warnings to configure, unfortunately that generates noise/things we/I haven't cared about earlier. I try to make sure that changes don't introduce new warnings in that. Looks good, merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This series makes sure that the return code of snprintf() is always evaluated correctly to make sure it does not run into errors silently.