nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.6' into maint-0.2.7

Browse Source
This commit is contained in:
Nick Mathewson 2016-01-18 20:00:16 -05:00
commit 8335b1f9a9
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug18089 Normal file
View File

@ -0,0 +1,6 @@
o Minor fixes (security):
- Make memwipe() do nothing when passed a NULL pointer
or zero size. Check size argument to memwipe() for underflow.
Closes bug #18089. Reported by "gk", patch by "teor".
Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352),
commit 49dd5ef3 on 7 Nov 2012.

8
src/common/crypto.c
View File

@ -2556,6 +2556,7 @@ smartlist_shuffle(smartlist_t *sl)
/** /**
* Destroy the <b>sz</b> bytes of data stored at <b>mem</b>, setting them to * Destroy the <b>sz</b> bytes of data stored at <b>mem</b>, setting them to
* the value <b>byte</b>. * the value <b>byte</b>.
* If <b>mem</b> is NULL or <b>sz</b> is zero, nothing happens.
* *
* This function is preferable to memset, since many compilers will happily * This function is preferable to memset, since many compilers will happily
* optimize out memset() when they can convince themselves that the data being * optimize out memset() when they can convince themselves that the data being
@ -2573,6 +2574,13 @@ smartlist_shuffle(smartlist_t *sl)
void void
memwipe(void *mem, uint8_t byte, size_t sz) memwipe(void *mem, uint8_t byte, size_t sz)
{ {
if (mem == NULL || sz == 0) {
return;
}
/* Data this large is likely to be an underflow. */
tor_assert(sz < SIZE_T_CEILING);
/* Because whole-program-optimization exists, we may not be able to just /* Because whole-program-optimization exists, we may not be able to just
* have this function call "memset". A smart compiler could inline it, then * have this function call "memset". A smart compiler could inline it, then
* eliminate dead memsets, and declare itself to be clever. */ * eliminate dead memsets, and declare itself to be clever. */