sysfs_unique_holder(): Check read() return value before using as buffer index

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index e1aaf4d9457804ecd7f7aab1f71bbf68d7235d91..6c17c5e464d313652a42ba6b99c0237d1dc62eca 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -619,7 +619,7 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int resume)
 
        memset(nm, 0, sizeof(nm));
        sprintf(dv, "/sys/dev/block/%d:%d", sd->disk.major, sd->disk.minor);
-       rv = readlink(dv, nm, sizeof(nm));
+       rv = readlink(dv, nm, sizeof(nm)-1);
        if (rv <= 0)
                return -1;
        nm[rv] = '\0';
@@ -796,6 +796,8 @@ int sysfs_unique_holder(int devnum, long rdev)
                }
                n = read(fd, buf, sizeof(buf)-1);
                close(fd);
+               if (n < 0)
+                       continue;
                buf[n] = 0;
                if (sscanf(buf, "%d:%d%c", &mj, &mn, &c) != 3 ||
                    c != '\n') {