From: Disconnect3d <dominik.b.czarnota@gmail.com>
Date: Mon, 13 Apr 2020 14:14:10 +0000 (+0200)
Subject: Fix off by one when checking "/dev/mapper/" path
X-Git-Tag: v2.36-rc1~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fa6e867892cea778333c95e209feb20cebd250e;p=thirdparty%2Futil-linux.git

Fix off by one when checking "/dev/mapper/" path

This PR fixes an off by one in `strncmp(dev->bid_name, "/dev/mapper/", 11)` check. The `"/dev/mapper/"` string literal has a length of 12 and without this fix paths like `"/dev/mapperSOMETHING"` would also be accepted.
---

diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index 014b3f490b..bb0211da40 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -258,7 +258,7 @@ set_pri:
 	if (dev) {
 		if (pri)
 			dev->bid_pri = pri;
-		else if (!strncmp(dev->bid_name, "/dev/mapper/", 11)) {
+		else if (!strncmp(dev->bid_name, "/dev/mapper/", 12)) {
 			dev->bid_pri = BLKID_PRI_DM;
 			if (is_dm_leaf(ptname))
 				dev->bid_pri += 5;