diff options
author | Thomas Jarosch <thomas.jarosch@intra2net.com> | 2011-10-17 10:48:10 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2011-10-18 12:57:59 -0400 |
commit | fe353178653b15add8626f5474842601be160281 (patch) | |
tree | 49c4d36e9f3929df1f561033722cbf72c65fee96 /tools | |
parent | ab067e99d22ec78ff646de1283348729d1aa66d4 (diff) |
tools, slub: Fix off-by-one buffer corruption after readlink() call
readlink() never zero terminates the provided buffer.
Therefore we already do
buffer[count] = 0;
This leads to an off-by-one buffer corruption as readlink()
might return the full size of the buffer.
The common technique is to reduce the buffer size by one.
Another fix would be to check
if (count < 0 || count == sizeof(buffer))
fatal();
Reducing the buffer size by one is easier IMHO.
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Christoph Lameter <cl@gentwo.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/slub/slabinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/slub/slabinfo.c b/tools/slub/slabinfo.c index 868cc93f7ac..cc1a378f9c0 100644 --- a/tools/slub/slabinfo.c +++ b/tools/slub/slabinfo.c | |||
@@ -1145,7 +1145,7 @@ static void read_slab_dir(void) | |||
1145 | switch (de->d_type) { | 1145 | switch (de->d_type) { |
1146 | case DT_LNK: | 1146 | case DT_LNK: |
1147 | alias->name = strdup(de->d_name); | 1147 | alias->name = strdup(de->d_name); |
1148 | count = readlink(de->d_name, buffer, sizeof(buffer)); | 1148 | count = readlink(de->d_name, buffer, sizeof(buffer)-1); |
1149 | 1149 | ||
1150 | if (count < 0) | 1150 | if (count < 0) |
1151 | fatal("Cannot read symlink %s\n", de->d_name); | 1151 | fatal("Cannot read symlink %s\n", de->d_name); |