summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2014-04-20 10:31:43 +0000
committerderaadt <deraadt@openbsd.org>2014-04-20 10:31:43 +0000
commitde62aa00e8f7ed3b4565704540d30731d9a8d729 (patch)
tree97c49cb4f125b1b3eafad87fc88a180f17be4d0c /lib/libssl/ssl_ciph.c
parentUpdate hotplug. Add qle_get_port_name_list, use it to discover local (diff)
downloadwireguard-openbsd-de62aa00e8f7ed3b4565704540d30731d9a8d729.tar.xz
wireguard-openbsd-de62aa00e8f7ed3b4565704540d30731d9a8d729.zip
Use calloc(a,b) instead of malloc(a*b) + memset(a*b). I don't know if
this instance is integer-overflowable, but we cannot keep hand-auditing every instance (or apathetically ignoring these issues) when the simple calloc idiom is better in the presence of a good calloc(). It is simply unfeasible to always enter correct range checks before the aggregate size calculation, just go find some 4000 lines of code, REPAIR THEM ALL, then come back and tell me I am wrong. This only works on systems where calloc() does the integer overflow check, but if your system doesn't do this, you need to ask your vendor WHY THEY ARE 10 YEARS BEHIND IN BEST PRACTICE? This is the kind of problem that needs to be solved at the right layer. malloc integer-overflow was implicated in the 2002 OpenSSH hole. OpenSSH and much other code is now written to use calloc(), for instance OpenSSH has 103 calls to it. We feel safer with our use of calloc(). It is a natural approach for us to use calloc(). How safe do you feel on systems which lack that range check in their calloc()? Good writeup from 2006: http://undeadly.org/cgi?action=article&sid=20060330071917
Diffstat (limited to 'lib/libssl/ssl_ciph.c')
-rw-r--r--lib/libssl/ssl_ciph.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index 7d2ea6c481c..87b3f7a3ccd 100644
--- a/lib/libssl/ssl_ciph.c
+++ b/lib/libssl/ssl_ciph.c
@@ -1030,12 +1030,11 @@ ssl_cipher_strength_sort(CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
curr = curr->next;
}
- number_uses = malloc((max_strength_bits + 1) * sizeof(int));
+ number_uses = calloc((max_strength_bits + 1), sizeof(int));
if (!number_uses) {
SSLerr(SSL_F_SSL_CIPHER_STRENGTH_SORT, ERR_R_MALLOC_FAILURE);
return (0);
}
- memset(number_uses, 0, (max_strength_bits + 1) * sizeof(int));
/*
* Now find the strength_bits values actually used