Skip to content
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

Jump to bottom

[apps/speed] Added checking for buflen overflow due to MAX_MISALIGNMENT. #17646

Closed
wants to merge 4 commits into from
Closed

[apps/speed] Added checking for buflen overflow due to MAX_MISALIGNMENT. #17646

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aab22e8
Added checking for buflen overflow due to MAX_MISALIGNMENT.
heavycrystal Feb 5, 2022
9ca2706
Updated fix-misalign with requested changes.
heavycrystal Feb 7, 2022
145b353
Moved help message to man page.
heavycrystal Feb 8, 2022
2033be3
Minor style nits and elimination of else branch.
heavycrystal Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions apps/speed.c
View file
Open in desktop
Expand Up @@ -455,7 +455,7 @@ static const OPT_PAIR sm2_choices[SM2_NUM] = {
static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */
#endif /* OPENSSL_NO_SM2 */

#define COND(unused_cond) (run && count < 0x7fffffff)
#define COND(unused_cond) (run && count < INT_MAX)
#define COUNT(d) (count)

typedef struct loopargs_st {
Expand Down Expand Up @@ -1778,7 +1778,13 @@ int speed_main(int argc, char **argv)
buflen = lengths[size_num - 1];
if (buflen < 36) /* size of random vector in RSA benchmark */
buflen = 36;
buflen += MAX_MISALIGNMENT + 1;
if (INT_MAX - (MAX_MISALIGNMENT + 1) < buflen)
{
Copy link
Member

Choose a reason for hiding this comment

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

Placement of { should be on the end of the preceding line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed this.

BIO_printf(bio_err, "Error: buffer size too large\n");
goto end;
} else {
Copy link
Contributor

Choose a reason for hiding this comment

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

Because each branch of the if is but a single statement, our coding style would suggest omitting the {} on both.

I think better might be changing the warning to an error and failing. In which case, the {} should be retained.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@paulidale Made it an error, also updated help with the maximum possible buffer size for clarity.

Copy link
Contributor

Choose a reason for hiding this comment

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

Even better.

Copy link
Member

Choose a reason for hiding this comment

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

This could actually be not an "else" at all and just unconditional since the main branch ends in a goto so will never get here anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed this as well.

buflen += MAX_MISALIGNMENT + 1;
}
loopargs[i].buf_malloc = app_malloc(buflen, "input buffer");
loopargs[i].buf2_malloc = app_malloc(buflen, "input buffer");
memset(loopargs[i].buf_malloc, 0, buflen);
Expand Down Expand Up @@ -3612,7 +3618,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
for (j = 0; j < num; j++) {
print_message(alg_name, 0, mblengths[j], seconds->sym);
Time_F(START);
for (count = 0; run && count < 0x7fffffff; count++) {
for (count = 0; run && count < INT_MAX; count++) {
unsigned char aad[EVP_AEAD_TLS1_AAD_LEN];
EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
size_t len = mblengths[j];
Expand Down
2 changes: 2 additions & 0 deletions doc/man1/openssl-speed.pod.in
View file
Open in desktop
Expand Up @@ -101,6 +101,8 @@ Run benchmarks for I<num> seconds.
=item B<-bytes> I<num>

Run benchmarks on I<num>-byte buffers. Affects ciphers, digests and the CSPRNG.
The limit on the size of the buffer is INT_MAX - 64 bytes, which for a 32-bit
int would be 2147483583 bytes.

=item B<-mr>

Expand Down