From: Karel Zak <kzak@redhat.com>
Date: Tue, 29 May 2018 10:09:56 +0000 (+0200)
Subject: lib/sysfs: fix sysfs_blkdev_get_wholedisk()
X-Git-Tag: v2.33-rc1~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f2d1e326c61c6ea70c0e14d2371645819517fd;p=thirdparty%2Futil-linux.git

lib/sysfs: fix sysfs_blkdev_get_wholedisk()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/sysfs.c b/lib/sysfs.c
index 953627715d..fcfdc46bb8 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -601,7 +601,7 @@ int sysfs_blkdev_get_wholedisk(	struct path_cxt *pc,
         }
 
         if (diskdevno) {
-            *diskdevno = __sysfs_devname_to_devno(ul_path_get_prefix(pc), diskname, NULL);
+            *diskdevno = __sysfs_devname_to_devno(ul_path_get_prefix(pc), name, NULL);
             if (!*diskdevno)
                 goto err;
         }
@@ -868,6 +868,8 @@ static dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, cons
 	if (!prefix)
 		prefix = "";
 
+	assert(name);
+
 	if (strncmp("/dev/", name, 5) == 0) {
 		/*
 		 * Read from /dev