aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJin Qian <jinqian@google.com>2017-04-17 16:13:20 -0700
committerTheodore Ts'o <tytso@mit.edu>2017-05-23 23:05:42 -0400
commit820344d352301847acee8e08b5f47b443fde846f (patch)
treed37b16fdee04c799aaf900df995c74074b7be4bc /lib
parent1ca6a8921a9c8a4f0b9bb56148905edbbe545f5d (diff)
downloade2fsprogs-820344d352301847acee8e08b5f47b443fde846f.tar.gz
libblkid: fix buffer overflow scanning partition name
If "line" is carefully crafted, sscanf will write 1 byte over ptname. Bug: 36103037 Change-Id: Ia19e032d7c65edc27373ebccc0a5569f0fa31161 From AOSP commit: 085e63d064620c763a62406a5ff4299bcee1838e Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'lib')
-rw-r--r--lib/blkid/devname.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index 671e781f0..444afdc9e 100644
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -397,7 +397,7 @@ static int probe_all(blkid_cache cache, int only_if_new)
{
FILE *proc;
char line[1024];
- char ptname0[128], ptname1[128], *ptname = 0;
+ char ptname0[129], ptname1[129], *ptname = 0;
char *ptnames[2];
dev_t devs[2];
int ma, mi;