summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorKarel Zak2017-09-15 13:30:45 +0200
committerKarel Zak2017-09-15 13:30:45 +0200
commitae1c9d60083d1e04c601a3ba3c6d19233d0643ed (patch)
tree86380f4d616c35e9487bf5e8d64c8365325a9e9c /misc-utils
parentswaplabel: fix --disable-libuuid compilation (diff)
downloadkernel-qcow2-util-linux-ae1c9d60083d1e04c601a3ba3c6d19233d0643ed.tar.gz
kernel-qcow2-util-linux-ae1c9d60083d1e04c601a3ba3c6d19233d0643ed.tar.xz
kernel-qcow2-util-linux-ae1c9d60083d1e04c601a3ba3c6d19233d0643ed.zip
uuidparse:fix stack-buffer-overflow [asan]
Reported-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/uuidparse.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c
index 19bb3f1b9..08ba33415 100644
--- a/misc-utils/uuidparse.c
+++ b/misc-utils/uuidparse.c
@@ -45,6 +45,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <uuid.h>
#include "c.h"
#include "closestream.h"
@@ -52,7 +53,6 @@
#include "optutils.h"
#include "strutils.h"
#include "timeutils.h"
-#include "uuid.h"
#include "xalloc.h"
/* column IDs */
@@ -279,8 +279,7 @@ static void print_output(struct control const *const ctrl, int argc,
if (i == 0) {
char uuid[UUID_STR_LEN];
- while (scanf(" %" stringify_value(UUID_STR_LEN)
- "[^ \t\n]%*c", uuid) && !feof(stdin))
+ while (scanf(" %36[^ \t\n]%*c", uuid) && !feof(stdin))
fill_table_row(tb, uuid);
}
scols_print_table(tb);