From 27a55c3367a3c66b075a2ef622f6aa1a3d19c24b Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Thu, 6 Jul 2017 20:55:41 +0200 Subject: disk: Choose correct partition in disk_open_dev() --- src/disk.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/disk.c b/src/disk.c index 0b6b494..6a75b35 100644 --- a/src/disk.c +++ b/src/disk.c @@ -127,9 +127,15 @@ int disk_open_dev(int maj, int min, int partition, int readonly) { return -1; } - memcpy(blkdev+len, "p1", 3); + if ( snprintf(blkdev+len, sizeof(blkdev)-len, "p%d", partition) >= (int)(sizeof(blkdev)-len) ) { + ERROR("Block device name is too long"); + return -1; + } if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) { - memcpy(blkdev+len, "1", 2); + if ( snprintf(blkdev+len, sizeof(blkdev)-len, "%d", partition) >= (int)(sizeof(blkdev)-len) ) { + ERROR("Block device name is too long"); + return -1; + } if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) { blkdev[len] = 0; fd = open(blkdev, O_RDONLY); -- cgit v1.2.3